Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ general/prog/doxygen.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -108,4 +108,5 @@
       <xref linkend="libxml2"/> (required for the tests),
       <xref linkend="llvm"/> (with clang),
+      <!-- Can someone check this? With LLVM7, it fails to build. -->
       <xref linkend="python2"/>,
       <xref linkend="qt5"/> (for doxywizard),
Index: gnome/applications/network-manager-applet.xml
===================================================================
--- gnome/applications/network-manager-applet.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ gnome/applications/network-manager-applet.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -110,8 +110,7 @@
       <xref linkend="gc"/> (for linker garbage collection),
       <xref linkend="gnome-bluetooth"/>,
-      <xref linkend="jansson"/>,
+      <xref linkend="jansson"/>, and
       <ulink url="&gnome-download-http;/mobile-broadband-provider-info">
-       mobile-broadband-provider-info</ulink> (runtime), and
-    <!--  <ulink url="http://www.digip.org/jansson/">Jansson</ulink> (for the team configuration editor) -->
+       mobile-broadband-provider-info</ulink> (runtime)
     </para>
 
@@ -156,7 +155,7 @@
 
     <para>
-      <parameter>-Denable-team=false</parameter>: This switch disables the team
-      configuration editor since it requires <application>Jansson</application>
-      which is not currently in BLFS.
+      <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>
 
Index: gnome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ gnome/platform/gjs.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -115,5 +115,6 @@
       <application>GTK</application> and <application>Cairo</application>
       tests will fail if not running in an Xorg session. Two tests that
-      use Unicode are known to fail.
+      use Unicode are known to fail, as C.UTF-8 isn't defined as a locale
+      in our environment.
     </para>
 
Index: kde/phonon-backend-gstreamer.xml
===================================================================
--- kde/phonon-backend-gstreamer.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ kde/phonon-backend-gstreamer.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -8,5 +8,5 @@
   <!ENTITY phonon-backend-gstreamer-download-ftp  " ">
   <!ENTITY phonon-backend-gstreamer-md5sum        "b2b0ca327908948ce8cdba117e31bf80">
-  <!ENTITY phonon-backend-gstreamer-size          "76 KB">
+  <!ENTITY phonon-backend-gstreamer-size          "80 KB">
   <!ENTITY phonon-backend-gstreamer-buildsize     "4.5 MB">
   <!ENTITY phonon-backend-gstreamer-time          "0.4 SBU">
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ multimedia/audioutils/audacious.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -9,5 +9,5 @@
   <!ENTITY audacious-download-ftp         " ">
   <!ENTITY audacious-md5sum               "95c79e14c412f274624c6979236a3840">
-  <!ENTITY audacious-size                 "551K KB">
+  <!ENTITY audacious-size                 "551 KB">
   <!ENTITY audacious-buildsize            "20 MB (with Gtk user interface)">
   <!ENTITY audacious-time                 "0.3 SBU (with Gtk user interface)">
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ networking/netutils/networkmanager.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -122,5 +122,4 @@
       <xref linkend="valgrind"/>,
       <ulink url="http://www.thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</ulink>,
-<!--      <ulink url="http://www.digip.org/jansson/">Jansson</ulink>, -->
       <ulink url="https://github.com/Distrotech/libaudit">libaudit</ulink>,
       <ulink url="https://github.com/jpirko/libteam">libteam</ulink>,
@@ -157,6 +156,6 @@
             --with-libnm-glib              \
             --disable-ppp                  \
-            --disable-json-validation      \
-            --disable-ovs                  \
+            <!--            - -disable-json-validation      \
+            - -disable-ovs                  \ -->
             --with-udev-dir=/lib/udev      \
             --with-systemdsystemunitdir=no \
@@ -172,6 +171,6 @@
             --with-libnm-glib                               \
             --disable-ppp                                   \
-            --disable-json-validation                       \
-            --disable-ovs                                   \
+<!--            - -disable-json-validation                       \
+                - -disable-ovs                                   \ -->
             --with-udev-dir=/lib/udev                       \
             --with-session-tracking=systemd                 \
@@ -231,7 +230,8 @@
     <para>
       <parameter>--disable-json-validation</parameter>: This parameter allows
-      building without <application>Jansson</application>, which is needed
+      building without <xref linkend="jansson"/>, which is needed
       for <quote>team</quote> configuration validation (team is one way
-      of bonding network interfaces for increased throughput).
+      of bonding network interfaces for increased throughput). Use it if
+      you do not have Jansson installed.
     </para>
 
@@ -239,6 +239,6 @@
       <parameter>--disable-ovs</parameter>: This paramenter disables
       <application>Open Virtual Switch</application> support because it
-      requires <application>Jansson</application> which is not available in
-      BLFS.
+      requires <xref linkend="jansson"/>. Use it if you don't have
+      Jansson installed.
     </para>
 
Index: networking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ networking/netutils/nmap.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -83,5 +83,6 @@
       <xref linkend="pygtk"/> (required for <command>zenmap</command>),
       <xref linkend="python2"/> (required for <command>ndiff</command>) and
-      <xref linkend="subversion"/> (required for <command>nmap-update</command>)
+      <xref linkend="subversion"/> (required for <command>nmap-update</command>),
+      and <xref linkend="libssh2"/>
     </para>
 
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ postlfs/editors/emacs.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -11,5 +11,5 @@
   <!ENTITY emacs-size          "42 MB">
   <!ENTITY emacs-buildsize     "427 MB">
-  <!ENTITY emacs-time          "0,6 SBU (Using parallelism=4)">
+  <!ENTITY emacs-time          "0.6 SBU (Using parallelism=4)">
 ]>
 
Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision ebf10d3ea139c76346af08b85507f1ff18a43501)
+++ xsoft/office/abiword.xml	(revision 8b0496bf04826e11c720c7c1f94c55385642e62e)
@@ -191,5 +191,5 @@
     -i src/text/ptbl/xp/pd_DocumentRDF.cpp &amp;&amp;
 
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr --without-evolution-data-server &amp;&amp;
 make</userinput></screen>
 
