Index: general.ent
===================================================================
--- general.ent	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ general.ent	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 15th &year;">
+<!ENTITY releasedate  "July 16th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ general/genutils/pinentry.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -87,5 +87,5 @@
     commands:</para>
 
-<screen><userinput>CXXFLAGS=-std=c++11 ./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen><!-- &amp;&amp;
 
@@ -124,16 +124,20 @@
 
     <para>
-      <envar>CXXFLAGS=-std=c++11</envar>: Fix a build problem with gcc-5.
+      <option>--enable-pinentry-qt4</option>: Use this switch if you wish to
+      install <command>pinentry-qt4</command>.
     </para>
 
     <para>
-      <option>--enable-pinentry-qt4</option>: Use this switch if ypu wish to
-      install <command>pinentry-qt4</command>. If both <xref linkend="qt4"/>
-      and <xref linkend="qt5"/> are installed, use <command>source
-      setqt4</command>, before starting. Also, you need to modify the
-      configuration step, using <command>CXX="g++ -std=c++11"
-      MOC="$QT4DIR/bin/moc" ./configure ...</command>, to fix building with
-      gcc-5 and for Qt4 <command>moc</command> (Qt4 meta object compiler)
-      detection.
+      <envar>CXXFLAGS=-std=c++11</envar>: If using
+      <option>--enable-pinentry-qt4</option> switch, add to the
+      <command>./configure ...</command> command line, to fix a build problem
+      with gcc-5.
+    </para>
+
+    <para>
+      <envar>MOC=$QT4DIR/bin/moc</envar>:  If using
+      <option>--enable-pinentry-qt4</option> switch, add to the
+      <command>./configure ...</command> command line, to help Qt4
+      <command>moc</command> (Qt4 meta object compiler) detection.
     </para>
 
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ gnome.ent	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -49,4 +49,4 @@
 <!ENTITY gucharmap-version            "3.16.2">
 <!ENTITY nautilus-version             "3.16.2">
-<!ENTITY network-manager-applet-version "1.0.2">
+<!ENTITY network-manager-applet-version "1.0.4">
 <!ENTITY seahorse-version             "3.16.0">
Index: gnome/applications/network-manager-applet.xml
===================================================================
--- gnome/applications/network-manager-applet.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ gnome/applications/network-manager-applet.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -9,8 +9,8 @@
   <!ENTITY network-manager-applet-download-ftp
            "&gnome-download-ftp;/network-manager-applet/1.0/network-manager-applet-&network-manager-applet-version;.tar.xz">
-  <!ENTITY network-manager-applet-md5sum        "5b2a8baa6b038b3e55e5444ff321e80d">
+  <!ENTITY network-manager-applet-md5sum        "7fc2ed3f0c46ed41ddabe99d51513b1c">
   <!ENTITY network-manager-applet-size          "1.3 MB">
-  <!ENTITY network-manager-applet-buildsize     "51 MB">
-  <!ENTITY network-manager-applet-time          "0.3 SBU">
+  <!ENTITY network-manager-applet-buildsize     "52 MB (with the tests)">
+  <!ENTITY network-manager-applet-time          "0.4 SBU (with the tests)">
 ]>
 
@@ -171,6 +171,5 @@
         </seg>
         <seg>
-          /usr/include/libnm-gtk,
-          /usr/share/libnm-gtk, and
+          /usr/{include,share}/libnm-gtk and
           /usr/share/nm-applet
         </seg>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ introduction/welcome/changelog.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -44,4 +44,26 @@
 
 -->
+
+    <listitem>
+      <para>July 15th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libepoxy-1.3.1. Fixes
+          <ulink url="&blfs-ticket-root;6726">#6726</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to Samba-4.2.3. Fixes
+          <ulink url="&blfs-ticket-root;6721">#6721</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to network-manager-applet-1.0.4. Fixes
+          <ulink url="&blfs-ticket-root;6720">#6720</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to NetworkManager-1.0.4. Fixes
+          <ulink url="&blfs-ticket-root;6720">#6720</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: lxqt/desktop/lxqt-common.xml
===================================================================
--- lxqt/desktop/lxqt-common.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ lxqt/desktop/lxqt-common.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -76,5 +76,5 @@
       <xref linkend="liblxqt"/>,
       <xref linkend="openbox"/> (runtime - may be replaced by another WM, e.g.
-      <xref linkend="xfwm4"/>, but it was not tested for BLFS),
+      <xref linkend="xfwm4"/>, but this has not been tested for BLFS),
       <xref linkend="qt5"/> built with <xref linkend="librsvg"/>, and
       <xref linkend="xdg-utils"/>
@@ -83,9 +83,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/>, or
+      <xref linkend="consolekit"/> alone or with
       <xref linkend="lxdm"/> or another Display Manager, e.g.
-      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this is reported
-      as the <quote>recommended <application>LXQt</application> display
-      manager</quote>,
+      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this has been
+      reported as the <quote>recommended <application>LXQt</application>
+      display manager</quote>),
       <xref linkend="desktop-file-utils"/>,
       <xref linkend="hicolor-icon-theme"/>, and
Index: lxqt/desktop/lxqt-policykit.xml
===================================================================
--- lxqt/desktop/lxqt-policykit.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ lxqt/desktop/lxqt-policykit.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -31,5 +31,5 @@
 
     <para>
-      The <application>lxqt-policykit</application> package the
+      The <application>lxqt-policykit</application> package is the
       <application>LXQt</application> PolicyKit agent.
     </para>
Index: lxqt/desktop/lxqt-runner.xml
===================================================================
--- lxqt/desktop/lxqt-runner.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ lxqt/desktop/lxqt-runner.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      kwindowsystem, from <xref linkend="kf5-frameworks"/>
+      kwindowsystem, from <xref linkend="kf5-frameworks"/>,
       <xref linkend="lxqt-common"/>,
       <xref linkend="lxqt-globalkeys"/> and
Index: lxqt/desktop/post-install.xml
===================================================================
--- lxqt/desktop/post-install.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ lxqt/desktop/post-install.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -38,9 +38,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="consolekit"/>, or
+      <xref linkend="consolekit"/> alone or with
       <xref linkend="lxdm"/> or another Display Manager, e.g.
-      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this is reported
-      as the <quote>recommended <application>LXQt</application> display
-      manager</quote>
+      <ulink url="https://github.com/sddm/sddm">sddm</ulink> (this has been
+      reported as the <quote>recommended <application>LXQt</application>
+      display manager</quote>)
     </para>
 
Index: lxqt/desktop/pre-install.xml
===================================================================
--- lxqt/desktop/pre-install.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ lxqt/desktop/pre-install.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -21,5 +21,5 @@
     <para>
       LXQt can be installed in /usr or /opt/lxqt.  The BLFS editors recommend
-      the latter in the BLFS environment. The former has not been tests in
+      the latter in the BLFS environment. The former has not been tested in
       BLFS.
     </para>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ networking/netprogs/samba.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -7,8 +7,8 @@
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "77f138cc0736549b03872279364766e0">
+  <!ENTITY samba-md5sum        "aeaa6ccee87727b7d01df7b6d0864c74">
   <!ENTITY samba-size          "20 MB">
-  <!ENTITY samba-buildsize     "487 MB (additional 399 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
-  <!ENTITY samba-time          "2.1 SBU, using parallelism=4 (additional 6.9 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
+  <!ENTITY samba-buildsize     "476 MB (additional 397 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "2.1 SBU, using parallelism=4 (additional 7.4 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -115,14 +115,4 @@
     </note>
 
-    <para>Fix some code when building with gnutls-3.4 and later:</para>
-
-<screen><userinput>sed -e 's/.*set_priority.*/\tgnutls_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL);/' \
-    -e '/cert_type_priority/d' \
-    -i source4/lib/tls/tls.c &amp;&amp;
-sed -e 's/.*set_priority.*/\tgnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL);/' \
-    -e '/t cert_type_priority/ s:^:/*:' \
-    -e '/t cert_type_priority/{n;N;N;N;s:$:*/:}' \
-    -i source4/lib/tls/tls_tstream.c</userinput></screen>
-
     <para>Install <application>Samba</application> by running the following
     commands:</para>
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ networking/netutils/networkmanager.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -9,8 +9,8 @@
   <!ENTITY NetworkManager-download-ftp
            "&gnome-download-ftp;/NetworkManager/1.0/NetworkManager-&NetworkManager-version;.tar.xz">
-  <!ENTITY NetworkManager-md5sum        "5a4899f89edcbdd1ac46d2d947e8d6eb">
-  <!ENTITY NetworkManager-size          "3.1 MB">
-  <!ENTITY NetworkManager-buildsize     "319 MB (additional 1 MB for the tests)">
-  <!ENTITY NetworkManager-time          "1.6 SBU (additional 0.2 SBU for the tests)">
+  <!ENTITY NetworkManager-md5sum        "7eabef7bd3bbdd6dc0473dd32aeac924">
+  <!ENTITY NetworkManager-size          "3.3 MB">
+  <!ENTITY NetworkManager-buildsize     "358 MB (with the tests)">
+  <!ENTITY NetworkManager-time          "2.6 SBU (with the tests)">
 ]>
 
@@ -122,9 +122,6 @@
 
     <para>
-      If <xref linkend="qt4"/> and  <xref linkend="qt5"/> are installed, you
-      need to choose <application>Qt4</application> with
-      <command>source setqt4</command>, before starting. Install
-      <application>NetworkManager</application> by running the following
-      commands:
+      Install <application>NetworkManager</application> by running the
+      following commands:
     </para>
 
@@ -264,9 +261,8 @@
         <seg>
           /etc/NetworkManager,
-          /usr/include/{libnm,libnm-glib,NetworkManager},
+          /usr/include/{libnm{,-glib},NetworkManager},
           /usr/lib/NetworkManager,
           /usr/share/doc/NetworkManager-&NetworkManager-version;,
-          /usr/share/gtk-doc/html/{libnm,libnm-glib,libnm-util,NetworkManager},
-          and
+          /usr/share/gtk-doc/html/{libnm{,-glib,-util},NetworkManager}, and
           /var/{lib,run}/NetworkManager
         </seg>
Index: packages.ent
===================================================================
--- packages.ent	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ packages.ent	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -110,5 +110,5 @@
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY libdrm-version               "2.4.62">
-<!ENTITY libepoxy-version             "1.2">
+<!ENTITY libepoxy-version             "1.3.1">
 <!ENTITY libesmtp-version             "1.0.6">
 <!ENTITY libffi-version               "3.2.1">
@@ -357,5 +357,5 @@
 <!ENTITY rpcbind-version              "0.2.3">
 <!ENTITY rsync-version                "3.1.1">
-<!ENTITY samba-version                "4.2.2">
+<!ENTITY samba-version                "4.2.3">
 <!ENTITY wget-version                 "1.16.3">
 <!ENTITY wireless-tools-version       "29">
@@ -366,5 +366,5 @@
 <!ENTITY bind-version                 "9.10.2-P2">
 <!ENTITY mod_dnssd-version            "0.6">
-<!ENTITY NetworkManager-version       "1.0.2">
+<!ENTITY NetworkManager-version       "1.0.4">
 <!ENTITY nmap-version                 "6.47">
 <!ENTITY traceroute-version           "2.0.21">
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ x/installing/xorg-server.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -96,5 +96,5 @@
     <para role="recommended">
       <xref linkend="libepoxy"/> (required for glamor, see command
-      explanations below)
+      explanations below) and
       <xref linkend="xcb-util-keysyms"/> (used by Xnest)
     </para>
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ x/lib/libepoxy.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libepoxy-download-http "http://crux.nu/files/libepoxy-&libepoxy-version;.tar.gz">
+  <!ENTITY libepoxy-download-http "https://github.com/anholt/libepoxy/releases/download/v&libepoxy-version;/libepoxy-&libepoxy-version;.tar.bz2">
   <!ENTITY libepoxy-download-ftp  " ">
-  <!ENTITY libepoxy-md5sum        "12d6b7621f086c0c928887c27d90bc30">
-  <!ENTITY libepoxy-size          "264 KB">
-  <!ENTITY libepoxy-buildsize     "21 MB">
-  <!ENTITY libepoxy-time          "0.2 SBU">
+  <!ENTITY libepoxy-md5sum        "96f6620a9b005a503e7b44b0b528287d">
+  <!ENTITY libepoxy-size          "804 KB">
+  <!ENTITY libepoxy-buildsize     "27 MB (with the tests)">
+  <!ENTITY libepoxy-time          "0.1 SBU (with the tests)">
 ]>
 
@@ -91,10 +91,9 @@
     </para>
 
-<screen><userinput>./autogen.sh --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>. Some
-      tests may fail for unknown reasons.
+      To test the results, issue: <command>make check</command>.
     </para>
 
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 895c4b753f6f8f016b8ed8f2805d969b79bba6d7)
+++ x/lib/webkitgtk.xml	(revision 7c4f32b99bd6fc54d99d66fcacd138ceb01c44cb)
@@ -146,13 +146,13 @@
       -DPORT=GTK                  \
       -DLIB_INSTALL_DIR=/usr/lib  \
+      -DENABLE_MINIBROWSER=ON     \
       -Wno-dev .. &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.-->
+      This package does not have a working testsuite. However, there is a
+      useable 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>
 
@@ -187,4 +187,9 @@
 
     <para>
+      <parameter>-DENABLE_MINIBROWSER=ON</parameter>: This switch enables the
+      <application>Mini Browser</application> compilation and install.
+    </para>
+
+    <para>
       <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
       against the system installed <application>malloc</application>.
@@ -215,5 +220,5 @@
       <seglistitem>
         <seg>
-          jsc
+          jsc and MiniBrowser
         </seg>
         <seg>
@@ -248,4 +253,16 @@
       </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="libjavascriptcoregtk-4.0">
         <term><filename
