Index: archive/libcroco.xml
===================================================================
--- archive/libcroco.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
+++ archive/libcroco.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook 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"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ general/genlib/genlib.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -93,5 +93,5 @@
   <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="libcroco.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="libdaemon.xml"/>
 <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
Index: neral/genlib/libcroco.xml
===================================================================
--- general/genlib/libcroco.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ 	(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 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"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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: gnome.ent
===================================================================
--- gnome.ent	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ gnome.ent	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -58,7 +58,7 @@
 <!ENTITY gnome-keyring-version             "3.36.0">
 <!ENTITY gnome-settings-daemon-version     "3.36.0">
-<!ENTITY gnome-control-center-version      "3.34.4">
-<!ENTITY mutter-version                    "3.34.4">
-<!ENTITY gnome-shell-version               "3.34.4">
+<!ENTITY gnome-control-center-version      "3.36.1">
+<!ENTITY mutter-version                    "3.36.1">
+<!ENTITY gnome-shell-version               "3.36.1">
 <!ENTITY gnome-shell-extensions-version    "3.34.2">
 <!ENTITY gnome-session-version             "3.34.2">
@@ -81,5 +81,5 @@
 <!-- gedit moved to Editors, so it's now in packages.ent -->
 <!ENTITY gnome-calculator-version          "3.34.1">
-<!ENTITY gnome-color-manager-version       "3.32.0">
+<!ENTITY gnome-color-manager-version       "3.36.0">
 <!ENTITY gnome-disk-utility-version        "3.34.4">
 <!ENTITY gnome-logs-version                "3.34.0">
@@ -93,5 +93,5 @@
 <!ENTITY gnome-weather-version             "3.34.0">
 <!ENTITY gucharmap-version                 "12.0.1">
-<!ENTITY network-manager-applet-version    "1.8.24">
+<!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
 <!ENTITY seahorse-version                  "3.36">
 <!ENTITY vinagre-version                   "3.22.0">
Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ gnome/applications/applications.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -44,5 +44,5 @@
   <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="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="vinagre.xml"/>
Index: gnome/applications/gnome-color-manager.xml
===================================================================
--- gnome/applications/gnome-color-manager.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ gnome/applications/gnome-color-manager.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-color-manager-download-http
-           "&gnome-download-http;/gnome-color-manager/&gnome-minor-32;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
+           "&gnome-download-http;/gnome-color-manager/&gnome-minor-36;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
   <!ENTITY gnome-color-manager-download-ftp
-           "&gnome-download-ftp;/gnome-color-manager/&gnome-minor-32;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
-  <!ENTITY gnome-color-manager-md5sum        "e6de219a25ac16630aca552936611c15">
-  <!ENTITY gnome-color-manager-size          "2.5 MB">
-  <!ENTITY gnome-color-manager-buildsize     "24 MB">
-  <!ENTITY gnome-color-manager-time          "0.2 SBU">
+           "&gnome-download-ftp;/gnome-color-manager/&gnome-minor-36;/gnome-color-manager-&gnome-color-manager-version;.tar.xz">
+  <!ENTITY gnome-color-manager-md5sum        "c5360705a68e88455b1801200e9aaa2e">
+  <!ENTITY gnome-color-manager-size          "2.1 MB">
+  <!ENTITY gnome-color-manager-buildsize     "18 MB">
+  <!ENTITY gnome-color-manager-time          "0.1 SBU">
 ]>
 
@@ -78,5 +78,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="colord-gtk"/>,
       <xref linkend="colord"/>,
       <xref linkend="gtk3"/>,
@@ -89,7 +88,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="exiv2"/>, and
-      <xref linkend="vte"/>
+      <xref linkend="desktop-file-utils"/>
     </para>
 
@@ -127,5 +124,6 @@
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>ninja test</command>. The tests must
+      be run from an X session.
     </para>
 
@@ -164,5 +162,5 @@
       <seglistitem>
         <seg>
-          gcm-calibrate, gcm-import, gcm-inspect,
+          <!--gcm-calibrate,--> gcm-import, gcm-inspect,
           gcm-picker, and gcm-viewer
         </seg>
@@ -182,4 +180,5 @@
       <?dbhtml list-presentation="table"?>
 
+<!-- Seems to be removed in 3.36.0
       <varlistentry id="gcm-calibrate">
         <term><command>gcm-calibrate</command></term>
@@ -193,5 +192,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="gcm-import">
         <term><command>gcm-import</command></term>
Index: ome/applications/network-manager-applet.xml
===================================================================
--- gnome/applications/network-manager-applet.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ 	(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 network-manager-applet-download-http
-           "&gnome-download-http;/network-manager-applet/1.8/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-download-ftp
-           "&gnome-download-ftp;/network-manager-applet/1.8/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum    "5c1bf351fde5adc12200345550516050">
-  <!ENTITY network-manager-applet-size      "1.9 MB">
-  <!ENTITY network-manager-applet-buildsize "65 MB (with tests)">
-  <!ENTITY network-manager-applet-time      "0.3 SBU (with tests)">
-]>
-
-<sect1 id="network-manager-applet" xreflabel="network-manager-applet-&network-manager-applet-version;">
-  <?dbhtml filename="network-manager-applet.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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>
-
-    &lfs91_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="gcr"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libnotify"/>, and
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="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"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="jansson"/>,
-      <ulink url="https://launchpad.net/libappindicator">libindicator</ulink>,
-      and <ulink url="&gnome-download-http;/mobile-broadband-provider-info">
-       mobile-broadband-provider-info</ulink> (runtime)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/network-manager-applet"/>
-    </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 --prefix=/usr     \
-      --sysconfdir=/etc \
-      -Dselinux=false   \
-      -Dteam=false      \
-      -Dmobile_broadband_provider_info=false \
-      -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>
-
-    <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>
-    <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>
-    <para>
-      <option>-Dintrospection=false</option>: Use this if you do not have <xref linkend="gobject-introspection"/> 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 <!-- and libnm-gtk.so -->
-        </seg>
-        <seg>
-          <!--/usr/include/{libnma,libnm-gtk},--> 
-          /usr/include/libnma and /usr/share/gtk-doc/libnma
-        </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>
-<!--
-      <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: gnome/platform/gnome-control-center.xml
===================================================================
--- gnome/platform/gnome-control-center.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ gnome/platform/gnome-control-center.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-control-center-download-http
-           "&gnome-download-http;/gnome-control-center/&gnome-minor-34;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+           "&gnome-download-http;/gnome-control-center/&gnome-minor-36;/gnome-control-center-&gnome-control-center-version;.tar.xz">
   <!ENTITY gnome-control-center-download-ftp
-           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-34;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "4a783c45d6775185a683f143a14d460e">
-  <!ENTITY gnome-control-center-size          "5.9 MB">
-  <!ENTITY gnome-control-center-buildsize     "170 MB (with tests)">
-  <!ENTITY gnome-control-center-time          "0.4 SBU (Using parallelism=4; with tests)">
+           "&gnome-download-ftp;/gnome-control-center/&gnome-minor-36;/gnome-control-center-&gnome-control-center-version;.tar.xz">
+  <!ENTITY gnome-control-center-md5sum        "29a6d529ba4e7ca6dc53018cc8378352">
+  <!ENTITY gnome-control-center-size          "6.0 MB">
+  <!ENTITY gnome-control-center-buildsize     "176 MB (with tests)">
+  <!ENTITY gnome-control-center-time          "0.5 SBU (Using parallelism=4; with tests)">
 ]>
 
@@ -100,5 +100,6 @@
       <xref linkend="libhandy"/>, and
       <xref linkend="ModemManager"/> and
-      <xref linkend="network-manager-applet"/> (for the Network Panel)
+      <xref linkend="libnma"/> (for the Network Panel)
+      <!-- gnome-remote-desktop can be used in the Sharing panel. -->
     </para>
 
Index: gnome/platform/gnome-shell.xml
===================================================================
--- gnome/platform/gnome-shell.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ gnome/platform/gnome-shell.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -6,11 +6,11 @@
 
   <!ENTITY gnome-shell-download-http
-           "&gnome-download-http;/gnome-shell/&gnome-minor-34;/gnome-shell-&gnome-shell-version;.tar.xz">
+           "&gnome-download-http;/gnome-shell/&gnome-minor-36;/gnome-shell-&gnome-shell-version;.tar.xz">
   <!ENTITY gnome-shell-download-ftp
-           "&gnome-download-ftp;/gnome-shell/&gnome-minor-34;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "692181c1a98be9e5f5b7e8738fd428ce">
-  <!ENTITY gnome-shell-size          "1.5 MB">
-  <!ENTITY gnome-shell-buildsize     "66 MB">
-  <!ENTITY gnome-shell-time          "0.1 SBU (Using parallelism=4)">
+           "&gnome-download-ftp;/gnome-shell/&gnome-minor-36;/gnome-shell-&gnome-shell-version;.tar.xz">
+  <!ENTITY gnome-shell-md5sum        "e0f5568c4fc9c1784167bf59845b5929">
+  <!ENTITY gnome-shell-size          "1.7 MB">
+  <!ENTITY gnome-shell-buildsize     "72 MB">
+  <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -81,7 +81,4 @@
       <xref linkend="gnome-autoar"/>,
       <xref linkend="gnome-control-center"/>,
-      <!-- FIXME in gnome-shell-3.36.0 libcroco will be included,
-        so when that goes in please archive libcroco -->
-      <xref linkend="libcroco"/>,
       <xref linkend="mutter"/>,
       <xref linkend="sassc"/>,
@@ -97,5 +94,5 @@
       <xref linkend="gnome-bluetooth"/>,
       <xref linkend="gst10-plugins-base"/>, and
-      <xref linkend="network-manager-applet"/>
+      <xref linkend="NetworkManager"/>
     </para>
 
Index: gnome/platform/mutter.xml
===================================================================
--- gnome/platform/mutter.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ gnome/platform/mutter.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-34;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-34;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "de19a6de98a2250dd7efdfca14359e39">
-  <!ENTITY mutter-size          "2.7 MB">
+  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-36;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-36;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-md5sum        "af300762ac1ed9b431144b55f3f6c1eb">
+  <!ENTITY mutter-size          "2.6 MB">
   <!ENTITY mutter-buildsize     "216 MB">
-  <!ENTITY mutter-time          "1.0 SBU (Using parallelism=4)">
+  <!ENTITY mutter-time          "1.1 SBU (Using parallelism=4)">
 ]>
 
@@ -73,4 +73,5 @@
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,4 +83,5 @@
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
@@ -91,4 +93,5 @@
       <xref linkend="gnome-desktop"/>,
       <xref linkend="gnome-settings-daemon"/>,
+      <xref linkend="graphene"/>,
       <xref linkend="libcanberra"/>,
       <xref linkend="libwacom"/>,
@@ -136,4 +139,5 @@
     <title>Installation of Mutter</title>
 
+    <!-- Not needed anymore with 3.36.1
     <para>
       First, apply a patch to Mutter to fix building with mesa-20.x and later:
@@ -141,4 +145,5 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../mutter-&mutter-version;-mesa_20_fixes-1.patch</userinput></screen>
+    -->
 
     <para>
@@ -180,8 +185,8 @@
         </seg>
         <seg>
-          libmutter-5.so
+          libmutter-6.so
         </seg>
         <seg>
-          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-5
+          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-6
         </seg>
       </seglistitem>
@@ -207,5 +212,5 @@
 
       <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-5.so</filename></term>
+        <term><filename class="libraryfile">libmutter-6.so</filename></term>
         <listitem>
           <para>
@@ -213,5 +218,5 @@
           </para>
           <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-5.so</primary>
+            <primary sortas="c-libmutter">libmutter-6.so</primary>
           </indexterm>
         </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ introduction/welcome/changelog.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -46,4 +46,39 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Archived libcroco.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13242">#13242</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mutter-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13242">#13242</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-control-center-3.36.1. Part of
+          <ulink url="&blfs-ticket-root;13242">#13242</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-color-manager-3.36.0. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to network-manager-applet-1.16.0. Part of
+          <ulink url="&blfs-ticket-root;13243">#13243</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Moved network-manager-applet to
+          Networking Utilities.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added graphene to the book. Fixes
+          <ulink url="&blfs-ticket-root;13347">#13347</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added libnma to the book. Fixes
+          <ulink url="&blfs-ticket-root;13346">#13346</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Moved polkit-gnome to Security. Fixes
           <ulink url="&blfs-ticket-root;13350">#13350</ulink>.</para>
Index: multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ multimedia/libdriv/gst10-plugins-base.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -100,4 +100,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="graphene"/>,
       <xref linkend="gtk3"/> (for examples),
       <xref linkend="gtk-doc"/>,
Index: networking/netlibs/libnma.xml
===================================================================
--- networking/netlibs/libnma.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
+++ networking/netlibs/libnma.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libnma-download-http "&gnome-download-http;/libnma/1.8/libnma-&libnma-version;.tar.xz">
+  <!ENTITY libnma-download-ftp  "&gnome-download-ftp;/libnma/1.8/libnma-&libnma-version;.tar.xz">
+  <!ENTITY libnma-md5sum        "094c45d7694b153612cbdc3c713edcb5">
+  <!ENTITY libnma-size          "1.3 MB">
+  <!ENTITY libnma-buildsize     "26 MB">
+  <!ENTITY libnma-time          "0.1 SBU (with tests)">
+
+]>
+
+<sect1 id="libnma" xreflabel="libnma-&libnma-version;">
+  <?dbhtml filename="libnma.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs91_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="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>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libnma"/>
+    </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 --prefix=/usr                             \
+      -Dgtk_doc=false                           \
+      -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>
+
+    <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>-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
+        </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>
+    </variablelist>
+  </sect2>
+</sect1>
Index: networking/netlibs/netlibs.xml
===================================================================
--- networking/netlibs/netlibs.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ networking/netlibs/netlibs.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -32,4 +32,5 @@
 <!--  <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"/>
Index: networking/netutils/netutils.xml
===================================================================
--- networking/netutils/netutils.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ networking/netutils/netutils.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -26,9 +26,6 @@
   <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"/>
-
-  <!-- systemd only -->  
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mod_dnssd.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"/>
Index: networking/netutils/network-manager-applet.xml
===================================================================
--- networking/netutils/network-manager-applet.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
+++ networking/netutils/network-manager-applet.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook 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/1.16/network-manager-applet-&network-manager-applet-version;.tar.xz">
+  <!ENTITY network-manager-applet-download-ftp
+           "&gnome-download-ftp;/network-manager-applet/1.16/network-manager-applet-&network-manager-applet-version;.tar.xz">
+  <!ENTITY network-manager-applet-md5sum    "9652c2757e85d6caba657405cf794fbd">
+  <!ENTITY network-manager-applet-size      "1.9 MB">
+  <!ENTITY network-manager-applet-buildsize "54 MB (with tests)">
+  <!ENTITY network-manager-applet-time      "0.3 SBU (with tests)">
+]>
+
+<sect1 id="network-manager-applet" xreflabel="network-manager-applet-&network-manager-applet-version;">
+  <?dbhtml filename="network-manager-applet.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs91_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"/>,
+      <xref linkend="libnotify"/>, and
+      <xref linkend="libsecret"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="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"/>,
+      <xref linkend="jansson"/>, and
+      <ulink url="https://launchpad.net/libappindicator">libindicator</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/network-manager-applet"/>
+    </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 --prefix=/usr     \
+      --sysconfdir=/etc \
+      -Dselinux=false   \
+      -Dteam=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>-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>
+
+    <!-- Same as above
+    <para>
+      <option>-Dintrospection=false</option>: Use this if you do not have <xref linkend="gobject-introspection"/> 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: packages.ent
===================================================================
--- packages.ent	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ packages.ent	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -130,5 +130,5 @@
 <!ENTITY libblockdev-version          "2.23">
 <!ENTITY libbytesize-version          "2.2">
-<!ENTITY libcroco-version             "0.6.13">
+<!--<!ENTITY libcroco-version             "0.6.13">-->
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY libdrm-version               "2.4.100">
@@ -589,4 +589,5 @@
 <!ENTITY NetworkManager-minor         "1.22">
 <!ENTITY NetworkManager-version       "&NetworkManager-minor;.10">
+<!ENTITY network-manager-applet-version "1.16.0">
 <!ENTITY nmap-version                 "7.80">
 <!ENTITY traceroute-version           "2.1.0">
@@ -608,4 +609,5 @@
 <!ENTITY libnl-version                "3.5.0">
 <!ENTITY libnl-dl-version             "3_5_0">
+<!ENTITY libnma-version               "1.8.28">
 <!ENTITY libnsl-version               "1.2.0">
 <!ENTITY libpcap-version              "1.9.1">
@@ -717,4 +719,5 @@
 <!ENTITY glu-version                  "9.0.1">
 <!ENTITY goffice010-version           "0.10.46">
+<!ENTITY graphene-version             "1.10.0">
 <!ENTITY gtk2-version                 "2.24.32">
 <!ENTITY gtk3-version                 "3.24.16">
Index: x/lib/graphene.xml
===================================================================
--- x/lib/graphene.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
+++ x/lib/graphene.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook 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 "https://github.com/ebassi/graphene/releases/download/&graphene-version;/graphene-&graphene-version;.tar.xz">
+  <!ENTITY graphene-download-ftp  " ">
+  <!ENTITY graphene-md5sum        "07f72436bc7a85d12f5edd9fcedd0184">
+  <!ENTITY graphene-size          "284 KB">
+  <!ENTITY graphene-buildsize     "15 MB">
+  <!ENTITY graphene-time          "0.1 SBU">
+
+]>
+
+<sect1 id="graphene" xreflabel="graphene-&graphene-version;">
+  <?dbhtml filename="graphene.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs91_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">
+      <xref linkend="glib2"/> and
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/graphene"/>
+    </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 --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>-Dgtk_doc=true</option>: Use this switch if you have
+      <xref 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/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 1f6af9915fd11ef8e012e605465580a4a6d7fd05)
+++ x/lib/lib.xml	(revision 2c80efe8f60d7c05b5e2fa4fa32f897a9f76ca33)
@@ -45,4 +45,5 @@
   <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="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"/>
