Index: general.ent
===================================================================
--- general.ent	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ general.ent	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 17th, &year;">
+<!ENTITY releasedate  "July 18th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -188,5 +188,5 @@
 <!ENTITY emacs-version                "24.3">
 <!ENTITY joe-version                  "3.7">
-<!ENTITY nano-version                 "2.3.5">
+<!ENTITY nano-version                 "2.3.6">
 <!ENTITY vim-version                  "7.4">
 
@@ -288,5 +288,5 @@
 <!ENTITY giflib-version               "5.1.0">
 <!ENTITY graphite2-version            "1.2.4">
-<!ENTITY harfbuzz-version             "0.9.31">
+<!ENTITY harfbuzz-version             "0.9.32">
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY imlib2-version               "1.4.6">
@@ -479,5 +479,5 @@
 <!ENTITY libevent-version             "2.0.21">
 <!ENTITY libnice-version              "0.1.7">
-<!ENTITY libnl-version                "3.2.24">
+<!ENTITY libnl-version                "3.2.25">
 <!ENTITY libpcap-version              "1.5.3">
 <!ENTITY libndp-version               "1.3">
@@ -547,5 +547,5 @@
 <!ENTITY xcb-util-renderutil-version  "0.3.9">
 <!ENTITY xcb-util-wm-version          "0.4.1">
-<!ENTITY xorg-server-version          "1.15.2">
+<!ENTITY xorg-server-version          "1.16.0">
 <!ENTITY twm-version                  "1.0.8">
 <!ENTITY xterm-version                "309">
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ general/graphlib/harfbuzz.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -8,8 +8,8 @@
            "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "ed9d9daa7d9762bf06076b1495188726">
+  <!ENTITY harfbuzz-md5sum        "b8c19f87ee7da0813c77a7b43bef4c98">
   <!ENTITY harfbuzz-size          "1.1 MB">
   <!ENTITY harfbuzz-buildsize     "25 MB (additional 2 MB for the API documentation)">
-  <!ENTITY harfbuzz-time          "0.4 SBU">
+  <!ENTITY harfbuzz-time          "0.3 SBU">
 ]>
 
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ general/prog/git.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -123,6 +123,6 @@
     <bridgehead renderas="sect4">Optional (to create the man pages and html docs)</bridgehead>
     <para>
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
-      <xref linkend="xmlto"/>
+      <xref linkend="xmlto"/> and
+      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ introduction/welcome/changelog.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -44,4 +44,30 @@
 
 -->
+
+    <listitem>
+      <para>July 18th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to harfbuzz-0.9.32. Fixes
+          <ulink url="&blfs-ticket-root;5279">#5279</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to nano-2.3.6. Fixes
+          <ulink url="&blfs-ticket-root;5278">#5278</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to xorg-server-1.16.0. Fixes
+          <ulink url="&blfs-ticket-root;5276">#5276</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libnl-3.2.25. Fixes
+          <ulink url="&blfs-ticket-root;5275">#5275</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - git-2.0.2 and curl-7.37.1: separate internal and
+          external dependencies.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ networking/netlibs/curl.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -85,10 +85,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libidn"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openldap"/>,
       <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink>,
-      <xref linkend="libidn"/>,
       <ulink url="https://launchpad.net/libmetalink/">libmetalink</ulink>,
-      <ulink url="http://www.libssh2.org">libssh2</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/> and
+      <ulink url="http://www.libssh2.org">libssh2</ulink>, and
       <ulink url="http://www.vintela.com/resources/topics/spnego/">
       SPNEGO</ulink>
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ networking/netlibs/libnl.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -8,8 +8,15 @@
   "http://www.carisma.slowglass.com/~tgr/libnl/files/libnl-&libnl-version;.tar.gz">
   <!ENTITY libnl-download-ftp  " ">
-  <!ENTITY libnl-md5sum        "6e0e7bad0674749d930dd9f285343d55">
-  <!ENTITY libnl-size          "784 KB">
-  <!ENTITY libnl-buildsize     "25 MB">
-  <!ENTITY libnl-time          "0.3 SBU">
+  <!ENTITY libnl-md5sum        "03f74d0cd5037cadc8cdfa313bbd195c">
+  <!ENTITY libnl-size          "816 KB">
+  <!ENTITY libnl-buildsize     "22 MB (additional 1 MB for the tests and 37MB for the API documentation)">
+  <!ENTITY libnl-time          "0.4 SBU">
+
+
+  <!ENTITY libnl-doc-download-http
+  "http://www.carisma.slowglass.com/~tgr/libnl/files/libnl-doc-&libnl-version;.tar.gz">
+  <!ENTITY libnl-doc-download-ftp  " ">
+  <!ENTITY libnl-doc-md5sum        "641f73052d9f54e720efe1a476a20237">
+  <!ENTITY libnl-doc-size          "15 MB">
 ]>
 
@@ -72,4 +79,28 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Optional Download</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libnl-doc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libnl-doc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libnl-doc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libnl-doc-size;
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">libnl Dependencies</bridgehead>
 
@@ -94,5 +125,5 @@
 <screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
-            --disable-static &amp;&amp;
+            --disable-static  &amp;&amp;
 make</userinput></screen>
 
@@ -106,4 +137,13 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If you wish to install the API docummentation, as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mkdir -vp /usr/share/doc/libnl-&libnl-version; &amp;&amp;
+tar -xf --strip-components=1 --no-same-owner \
+        ../libnl-doc-&libnl-version;.tar.gz -C /usr/share/doc/libnl-&libnl-version;</userinput></screen>
 
   </sect2>
@@ -142,11 +182,13 @@
           libnl-genl-3.so,
           libnl-idiag-3.so,
-          libnl-nf-3.so, and 
-          libnl-route-3.so
+          libnl-nf-3.so, 
+          libnl-route-3.so, and
+          cli modules under /usr/lib/libnl/cli tree
         </seg>
         <seg>
           /etc/libnl,
-          /usr/include/libnl3, and
-          /usr/lib/libnl
+          /usr/include/libnl3,
+          /usr/lib/libnl, and
+          /usr/share/doc/libnl-&libnl-version;
         </seg>
       </seglistitem>
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ postlfs/editors/nano.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -7,5 +7,5 @@
   <!ENTITY nano-download-http "http://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
   <!ENTITY nano-download-ftp  "ftp://ftp.gnu.org/gnu/nano/nano-&nano-version;.tar.gz">
-  <!ENTITY nano-md5sum        "a771f6283ac1edee8e5486209910c829">
+  <!ENTITY nano-md5sum        "df3d201aecb3155a80633990cc467831">
   <!ENTITY nano-size          "1.8 MB">
   <!ENTITY nano-buildsize     "11 MB">
@@ -90,7 +90,5 @@
     commands:</para>
 
-<screen><userinput>sed -i '/dnl Silence/,+3d' configure.ac &amp;&amp;<!-- already commited upstream, remove it and the entry in Command Explanations, in next update-->
-autoreconf -fiv &amp;&amp;
-./configure --prefix=/usr     \
+<screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-utf8     \
@@ -114,10 +112,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '/dnl Silence/,+3d' configure.ac</command>: Fixes the
-      directory <filename class="directory">locale</filename> to be placed under
-      <filename class="directory">/usr/share</filename>.
-    </para>
 
     <para>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 7daf33ba8eb60af4606c9e84eadf7753e468adaa)
+++ x/installing/xorg-server.xml	(revision fad8db27b42046ea6993e8f2d06d6bd49cf56c13)
@@ -7,7 +7,7 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "69229fe5cdf3f20f74665d57b7601d26">
-  <!ENTITY xorg-server-size          "5.3 MB">
-  <!ENTITY xorg-server-buildsize     "475 MB">
+  <!ENTITY xorg-server-md5sum        "8a9ff6ee9907360f09b5bdabb8089502">
+  <!ENTITY xorg-server-size          "5.6 MB">
+  <!ENTITY xorg-server-buildsize     "434 MB">
   <!ENTITY xorg-server-time          "1.6 SBU">
 ]>
@@ -121,7 +121,9 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG \
-           --with-xkb-output=/var/lib/xkb \
-           --enable-install-setuid &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG                    \
+           --with-xkb-output=/var/lib/xkb   \
+           --enable-dmx                     \
+           --enable-install-setuid          \
+           --enable-suid-wrapper            &amp;&amp;
 make</userinput></screen>
 
@@ -148,7 +150,17 @@
 
     <para>
+      <parameter>--enable-dmx</parameter>: Build DMX (Distributed Multihead X)
+      server.
+    </para>
+
+    <para>
       <parameter>--enable-install-setuid</parameter>: The Xorg binary must run as
       the root user. This switch ensures that the binary is installed
       setuid when <command>make</command> is run by an unprivileged user.
+    </para>
+
+    <para>
+      <parameter>--enable-suid-wrapper</parameter>: Build suid-root wrapper for
+      legacy driver support on rootless xserver systems.
     </para>
 
