Index: archive/noto-fonts.xml
===================================================================
--- archive/noto-fonts.xml	(revision d9994c1c6d111856603a752f1e3695e77c9c729b)
+++ archive/noto-fonts.xml	(revision d9994c1c6d111856603a752f1e3695e77c9c729b)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY 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"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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: archive/oxygen-fonts.xml
===================================================================
--- archive/oxygen-fonts.xml	(revision d9994c1c6d111856603a752f1e3695e77c9c729b)
+++ archive/oxygen-fonts.xml	(revision d9994c1c6d111856603a752f1e3695e77c9c729b)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook 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"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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: kde/kf5/kf5.xml
===================================================================
--- kde/kf5/kf5.xml	(revision 7ba67dbe90cb3119ea7e9f588fd51aa0b70ad433)
+++ kde/kf5/kf5.xml	(revision d9994c1c6d111856603a752f1e3695e77c9c729b)
@@ -17,8 +17,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-intro.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-fonts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="noto-fonts.xml"/>
--->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-frameworks.xml"/>
 
Index: e/kf5/noto-fonts.xml
===================================================================
--- kde/kf5/noto-fonts.xml	(revision 7ba67dbe90cb3119ea7e9f588fd51aa0b70ad433)
+++ 	(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 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"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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: e/kf5/oxygen-fonts.xml
===================================================================
--- kde/kf5/oxygen-fonts.xml	(revision 7ba67dbe90cb3119ea7e9f588fd51aa0b70ad433)
+++ 	(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 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"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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>
