Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ general/genlib/libatasmart.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -95,5 +95,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make docdir=/usr/share/doc/libatasmart-&libatasmart-version; install</userinput></screen>
 
   </sect2>
@@ -137,5 +137,5 @@
         <listitem>
           <para>
-            is an utility that reports on the status of the disk.
+            is a utility that reports on the status of the disk.
           </para>
           <indexterm zone="libatasmart skdump">
@@ -149,5 +149,5 @@
         <listitem>
           <para>
-            is an utility to issue disks tests.
+            is a utility to issue disks tests.
           </para>
           <indexterm zone="libatasmart sktest">
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ general/genlib/libical.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -57,8 +57,9 @@
     </itemizedlist>
 
+    <!-- There is no support for the current version of BLFS BDB
     <bridgehead renderas="sect3">libical Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="db"/></para>
+    <para role="optional"><xref linkend="db"/></para> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -84,11 +85,13 @@
   </sect2>
 
+  <!--  There is no support for the current version of BLFS BDB
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--with-bdb4</option>: This option adds support for
+    <para><option>-with-bdb4</option>: This option adds support for
     <application>Berkeley DB 4.0</application>.</para>
 
   </sect2>
+  -->
 
   <sect2 role="content">
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ general/prog/php.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -205,11 +205,11 @@
 
 install -v -m755 -d /usr/share/doc/php-&php-version; &amp;&amp;
-install -v -m644 CODING_STANDARDS EXTENSIONS INSTALL NEWS \
-                 README* UPGRADING* php.gif \
-    /usr/share/doc/php-&php-version; &amp;&amp;
-ln -v -sfn /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
-         /usr/share/doc/php-&php-version; &amp;&amp;
-ln -v -sfn /usr/lib/php/doc/Structures_Graph/docs \
-         /usr/share/doc/php-&php-version;</userinput></screen>
+install -v -m644    CODING_STANDARDS EXTENSIONS INSTALL NEWS \
+                    README* UPGRADING* php.gif \
+                    /usr/share/doc/php-&php-version; &amp;&amp;
+ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
+                    /usr/share/doc/php-&php-version; &amp;&amp;
+ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs \
+                    /usr/share/doc/php-&php-version;</userinput></screen>
 
     <para>The pre-built HTML documentation is packaged in two forms: a tarball
@@ -273,5 +273,5 @@
       enables command line <application>Readline</application> support.</para>
 
-      <para><parameter>--disable-libxml</parameter>: This parameter
+      <para><option>--disable-libxml</option>: This option
       allows building PHP without <application>libxml2</application>
       installed.</para>
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ general/prog/tcl.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -162,6 +162,6 @@
 
     <para>
-      <option>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
-      --enable-64bit)</option>: This switch is used to enable 64 bit
+      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
+      --enable-64bit)</parameter>: This switch is used to enable 64 bit
       support in <application>Tcl</application> on 64 bit operating
       systems.
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ general/prog/tk.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -128,6 +128,6 @@
 
     <para>
-      <option>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
-      --enable-64bit)</option>: This switch is used to enable 64 bit
+      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
+      --enable-64bit)</parameter>: This switch is used to enable 64 bit
       support in <application>Tk</application> on 64 bit operating
       systems.
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ general/sysutils/bluez.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -83,5 +83,5 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="check"/>,
-      <xref linkend="cups"/>,
+      <!-- <xref linkend="cups"/>, -->
       <xref linkend="gst-plugins-base"/>,
       <xref linkend="libsndfile"/> and
@@ -164,5 +164,6 @@
 <screen role="root"><userinput>for CONFFILE in audio input network serial ; do
     install -v -m644 ${CONFFILE}/${CONFFILE}.conf /etc/bluetooth/${CONFFILE}.conf
-done</userinput></screen>
+done
+unset CONFFILE</userinput></screen>
 
     <para>
@@ -180,69 +181,71 @@
 
     <para>
-      <option>--enable-bccmd</option>: This switch enables building of the BCCMD
+      <parameter>--enable-bccmd</parameter>: This switch enables building of the BCCMD
       interface utility. 
     </para>
 
     <para>
-      <option>--enable-dfutool</option>: This switch enables building of the DFU
+      <parameter>--enable-dfutool</parameter>: This switch enables building of the DFU
       firmware upgrade utility. 
     </para>
 
     <para>
-      <option>--enable-dund</option>: This switch enables building of the DUN daemon. 
-    </para>
-
-    <para>
-      <option>--enable-hid2hci</option>: This switch enables building of the HID
+      <parameter>--enable-dund</parameter>: This switch enables building of the DUN daemon. 
+    </para>
+
+    <para>
+      <parameter>--enable-hid2hci</parameter>: This switch enables building of the HID
       mode switching utility. 
     </para>
 
     <para>
-      <option>--enable-hidd</option>: This switch enables building of the HID daemon. 
-    </para>
-
-    <para>
-      <option>--enable-pand</option>: This switch enables building of the PAN daemon. 
-    </para>
-
-    <para>
-      <option>--enable-tools</option>: This switch enables building of the Bluetooth
+      <parameter>--enable-hidd</parameter>: This switch enables building of the HID daemon. 
+    </para>
+
+    <para>
+      <parameter>--enable-pand</parameter>: This switch enables building of the PAN daemon. 
+    </para>
+
+    <para>
+      <parameter>--enable-tools</parameter>: This switch enables building of the Bluetooth
       utilities. 
     </para>
 
     <para>
-      <option>--enable-wiimote</option>: This switch enables building of the Wii
+      <parameter>--enable-wiimote</parameter>: This switch enables building of the Wii
       Remote plugin. 
     </para>
 
     <para>
-      <option>--disable-test</option>: This switch disables installation of the
+      <parameter>--disable-test</parameter>: This switch disables installation of the
       test programs. 
     </para>
 
     <para>
-      <option>--without-systemdunitdir</option>: This switch disables installation
+      <parameter>--without-systemdunitdir</parameter>: This switch disables installation
       of the systemd units. 
     </para>
 
     <para>
-      <option>--enable-alsa</option>: This switch enables ALSA support. Use if you
+      <option>--enable-cups</option>: This switch enables CUPS backend support. Note
+      that CUPS does not need to be installed for this support.
+    </para>
+
+    <!-- These options are automatically found and used if the packages are
+         available. There is no need to use these switches.
+    <para>
+      <option>-enable-alsa</option>: This switch enables ALSA support. Use if you
       have <xref linkend="alsa-lib"/> installed. 
     </para>
 
     <para>
-      <option>--enable-cups</option>: This switch enables CUPS backend support. Use
-      if you have <xref linkend="cups"/> installed. 
-    </para>
-
-    <para>
-      <option>--enable-gstreamer</option>: This switch enables GStreamer support. Use
+      <option>-enable-gstreamer</option>: This switch enables GStreamer support. Use
       if you have <xref linkend="gst-plugins-base"/> installed. 
     </para>
 
     <para>
-      <option>--enable-usb</option>: This switch enables USB support. Use if you have
+      <option>-enable-usb</option>: This switch enables USB support. Use if you have
       <xref linkend="libusb-compat"/> installed. 
-    </para>
+    </para> -->
 
   </sect2>
Index: gnome/core/libsecret.xml
===================================================================
--- gnome/core/libsecret.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ gnome/core/libsecret.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -92,5 +92,6 @@
     <bridgehead renderas="sect4">Optional (Required for the testsuite)</bridgehead>
     <para role="optional">
-      <xref linkend="gjs"/> and
+      <xref linkend="gjs"/>,
+      <xref linkend="dbus-python"/> and
       <xref linkend="pygobject3"/>
     </para>
@@ -113,5 +114,6 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make -k check</command>. The
+      JavaScript tests fail for unknown reasons.
     </para>
 
Index: multimedia/libdriv/gst-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst-plugins-bad.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ multimedia/libdriv/gst-plugins-bad.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -182,10 +182,10 @@
     <para>
       <parameter>--with-gtk=3.0</parameter>: Build against <application>GTK+ 3</application>
-      instead of the default <application>GTK+ 2</application>: recommended for a
+      instead of the default <application>GTK+ 2</application>; recommended for a
       <application>GNOME</application> Desktop.
     </para>
 
     <para>
-      <option>--disable-examples</option>: if the dependencies for the camera
+      <parameter>--disable-examples</parameter>: If the dependencies for the camera
       driver have been satisfied, the associated example code fails to build.
     </para>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ multimedia/videoutils/mplayer.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -191,6 +191,6 @@
       <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
       <ulink url="http://sourceforge.net/projects/bs2b/">libbs2b</ulink>,
-      <ulink url="http://www.lirc.org/">LIRC</ulink> and
-      <ulink url="http://www.dolda2000.com/~fredrik/lirccd/">LIRC Client Daemon</ulink>,
+      <ulink url="http://www.lirc.org/">LIRC</ulink> (and
+      <ulink url="http://www.dolda2000.com/~fredrik/lirccd/">LIRC Client Daemon</ulink>),
       <xref linkend="unrar"/>, and
       <xref linkend="libxslt"/>,
@@ -312,6 +312,6 @@
       source and without this option it will statically compile the included
       version of FFmpeg into itself. Dynamically linking to a system installed
-      FFmpeg makes MPlayer and Mencoder about 9MB smaller. If MPlayer is crashy
-      or unstable linked to a system installed FFmpeg, try recompiling MPlayer
+      FFmpeg makes MPlayer and Mencoder about 9MB smaller. If MPlayer exhibits
+      unstable behavior linked to a system installed FFmpeg, try recompiling MPlayer
       without this option (it is always more thoroughly tested with the included
       FFmpeg).
Index: networking/netlibs/geoclue.xml
===================================================================
--- networking/netlibs/geoclue.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ networking/netlibs/geoclue.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -162,5 +162,5 @@
 
     <para>
-      <option>--libexecdir=/usr/lib/geoclue</option>: This option installs
+      <parameter>--libexecdir=/usr/lib/geoclue</parameter>: This option installs
       <application>GeoClue's</application> private executables into
       <filename class="libraryfile">/usr/lib/geoclue</filename>.
Index: postlfs/filesystems/fuse.xml
===================================================================
--- postlfs/filesystems/fuse.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ postlfs/filesystems/fuse.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -98,4 +98,17 @@
     <title>Installation of Fuse</title>
 
+    <note>
+      <para>
+        After the <command>configure</command> script has finished you will
+        see a warning shown below. You can safely disregard this warning.
+      </para>
+
+<screen><computeroutput>configure: WARNING:
+******************************************************************
+* Please install util-linux version 2.18 or later which supports *
+* --fake and --no-canonicalize options in mount and umount       *
+******************************************************************</computeroutput></screen>
+    </note>
+
     <para>
       Install <application>Fuse</application> by running the following
@@ -107,4 +120,9 @@
 
     <para>
+      If you have <xref linkend="doxygen"/> installed and wish to build the API
+      documentation, issue <command>doxygen doc/Doxyfile</command>.
+    </para>
+
+    <para>
       This package does not come with a test suite.
     </para>
@@ -115,7 +133,22 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-mv -v /usr/lib/libfuse.so.* /lib &amp;&amp;
+
+mv -v   /usr/lib/libfuse.so.* /lib &amp;&amp;
 ln -sfv ../../lib/libfuse.so.&fuse-version; /usr/lib/libfuse.so &amp;&amp;
-rm -rf /tmp/init.d</userinput></screen>
+rm -rf  /tmp/init.d &amp;&amp;
+
+install -v -m755 -d /usr/share/doc/fuse-&fuse-version; &amp;&amp;
+install -v -m644    doc/{how-fuse-works,kernel.txt} \
+                    /usr/share/doc/fuse-&fuse-version;</userinput></screen>
+
+    <para>
+      If you built the API documentation, install it as the
+      <systemitem class="username">root</systemitem> user by issuing the
+      following commands:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/fuse-&fuse-version;/api &amp;&amp;
+install -v -m644    doc/html/* \
+                    /usr/share/doc/fuse-&fuse-version;/api</userinput></screen>
   </sect2>
 
@@ -127,15 +160,16 @@
 
     <para>
-      <parameter>INIT_D_PATH=/tmp/init.d</parameter>: This parameter makes it
-      install its bootscript into <filename>/tmp/init.d</filename>.
-    </para>
-
-    <para>
-      <command>mv -v /usr/lib/libfuse.so.* /lib</command>: This moves
-      <application>FUSE</application> library to root filesystem 
-      so that it is available at early boot in case
-      <filename class="directory">/usr</filename> is on seperate
-      partition and <xref linkend="ntfs-3g"/> is built with system
-      <application>FUSE</application>.
+      <parameter>INIT_D_PATH=/tmp/init.d</parameter>: This parameter installs
+      the bootscript into <filename class="directory">/tmp/init.d</filename> as
+      a bootscript is not required.
+    </para>
+
+    <para>
+      <command>mv -v /usr/lib/libfuse.so.* /lib</command>: This moves the
+      <application>FUSE</application> library to the root filesystem 
+      so that it is available early in the boot process in case
+      <filename class="directory">/usr</filename> is mounted on a separate
+      partition and <xref linkend="ntfs-3g"/> is built with a system-installed
+      version of <application>FUSE</application>.
     </para>
 
Index: xincludes/static-libraries.xml
===================================================================
--- xincludes/static-libraries.xml	(revision cd34755042560d2a25bb358e8494c720ec92305e)
+++ xincludes/static-libraries.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
@@ -7,5 +7,5 @@
 
     <para>
-      <option>--disable-static</option>: This switch prevents 
+      <parameter>--disable-static</parameter>: This switch prevents 
       installation of static versions of the libraries.
     </para>
