diff --git a/general/genlib/libatasmart.xml b/general/genlib/libatasmart.xml
index ed64d37576..bffdcb79be 100644
--- a/general/genlib/libatasmart.xml
+++ b/general/genlib/libatasmart.xml
@@ -94,7 +94,7 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </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>
 
@@ -136,7 +136,7 @@ make</userinput></screen>
         <term><command>skdump</command></term>
         <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">
             <primary sortas="b-skdump">skdump</primary>
@@ -148,7 +148,7 @@ make</userinput></screen>
         <term><command>sktest</command></term>
         <listitem>
           <para>
-            is an utility to issue disks tests.
+            is a utility to issue disks tests.
           </para>
           <indexterm zone="libatasmart sktest">
             <primary sortas="b-sktest">sktest</primary>
diff --git a/general/genlib/libical.xml b/general/genlib/libical.xml
index 577deaadd2..d66fdf136e 100644
--- a/general/genlib/libical.xml
+++ b/general/genlib/libical.xml
@@ -56,10 +56,11 @@
       </listitem>
     </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:
     <ulink url="&blfs-wiki;/libical"/></para>
@@ -83,13 +84,15 @@ make</userinput></screen>
 
   </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">
     <title>Contents</title>
diff --git a/general/prog/php.xml b/general/prog/php.xml
index 66ac5d874c..17f0c65516 100644
--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@@ -204,13 +204,13 @@ make</userinput></screen>
 install -v -m644 php.ini-production /etc/php.ini &amp;&amp;
 
 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
     containing many individual files, useful for quick loading into your
@@ -272,7 +272,7 @@ gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput></sc
       <para><parameter>--with-readline</parameter>: This parameter
       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>
 
diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml
index 7886489675..66b7c11c6d 100644
--- a/general/prog/tcl.xml
+++ b/general/prog/tcl.xml
@@ -161,8 +161,8 @@ cp -v -r  ../html/* /usr/share/doc/tcl-&tcl-version;</userinput></screen>
     <title>Command Explanations</title>
 
     <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.
     </para>
diff --git a/general/prog/tk.xml b/general/prog/tk.xml
index 680cbd0bf0..5bbc60a93b 100644
--- a/general/prog/tk.xml
+++ b/general/prog/tk.xml
@@ -127,8 +127,8 @@ chmod -v 755 /usr/lib/libtk&tk-ver;.so</userinput></screen>
     <title>Command Explanations</title>
 
     <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.
     </para>
diff --git a/general/sysutils/bluez.xml b/general/sysutils/bluez.xml
index c0c801a133..ca624d1280 100644
--- a/general/sysutils/bluez.xml
+++ b/general/sysutils/bluez.xml
@@ -82,7 +82,7 @@
     <para role="optional">
       <xref linkend="alsa-lib"/>,
       <xref linkend="check"/>,
-      <xref linkend="cups"/>,
+      <!-- <xref linkend="cups"/>, -->
       <xref linkend="gst-plugins-base"/>,
       <xref linkend="libsndfile"/> and
       <xref linkend="libusb-compat"/>
@@ -163,7 +163,8 @@ make</userinput></screen>
 
 <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>
       If desired, install the API documentation as the
@@ -179,71 +180,73 @@ install -v -m644 doc/*.txt /usr/share/doc/bluez-&bluez-version;</userinput></scr
     <title>Command Explanations</title>
 
     <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. 
+      <parameter>--enable-dund</parameter>: This switch enables building of the DUN daemon. 
     </para>
 
     <para>
-      <option>--enable-hid2hci</option>: This switch enables building of the HID
+      <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. 
+      <parameter>--enable-hidd</parameter>: This switch enables building of the HID daemon. 
     </para>
 
     <para>
-      <option>--enable-pand</option>: This switch enables building of the PAN daemon. 
+      <parameter>--enable-pand</parameter>: This switch enables building of the PAN daemon. 
     </para>
 
     <para>
-      <option>--enable-tools</option>: This switch enables building of the Bluetooth
+      <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>
 
diff --git a/gnome/core/libsecret.xml b/gnome/core/libsecret.xml
index 8b5b437f28..8d834cac55 100644
--- a/gnome/core/libsecret.xml
+++ b/gnome/core/libsecret.xml
@@ -91,7 +91,8 @@
 
     <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>
 
@@ -112,7 +113,8 @@
 make</userinput></screen>
 
     <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>
 
     <para>
diff --git a/multimedia/libdriv/gst-plugins-bad.xml b/multimedia/libdriv/gst-plugins-bad.xml
index e702546e93..26b91732ab 100644
--- a/multimedia/libdriv/gst-plugins-bad.xml
+++ b/multimedia/libdriv/gst-plugins-bad.xml
@@ -181,12 +181,12 @@ make</userinput></screen>
 
     <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>
 
diff --git a/multimedia/videoutils/mplayer.xml b/multimedia/videoutils/mplayer.xml
index 3e120f95ce..b26a9552ed 100644
--- a/multimedia/videoutils/mplayer.xml
+++ b/multimedia/videoutils/mplayer.xml
@@ -190,8 +190,8 @@
       <xref linkend="gtk2"/> (required for the GUI),
       <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"/>,
       <xref linkend="DocBook"/> and
@@ -311,8 +311,8 @@ ln -sfv Clearlooks /usr/share/mplayer/skins/default</userinput></screen>
       installed <xref linkend="ffmpeg"/>. MPlayer includes a copy of the FFmpeg
       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).
     </para>
diff --git a/networking/netlibs/geoclue.xml b/networking/netlibs/geoclue.xml
index 5749295fbe..5c239acab3 100644
--- a/networking/netlibs/geoclue.xml
+++ b/networking/netlibs/geoclue.xml
@@ -161,7 +161,7 @@ make</userinput></screen>
     </para>
 
     <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>.
     </para>
diff --git a/postlfs/filesystems/fuse.xml b/postlfs/filesystems/fuse.xml
index 1ef6e4f81b..e9dfd2efa9 100644
--- a/postlfs/filesystems/fuse.xml
+++ b/postlfs/filesystems/fuse.xml
@@ -97,6 +97,19 @@
   <sect2 role="installation">
     <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
       commands:
@@ -105,6 +118,11 @@
 <screen><userinput>./configure --prefix=/usr --disable-static INIT_D_PATH=/tmp/init.d &amp;&amp;
 make</userinput></screen>
 
+    <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>
@@ -114,9 +132,24 @@ make</userinput></screen>
     </para>
 
 <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>
 
   <sect2 role="commands">
@@ -126,17 +159,18 @@ rm -rf /tmp/init.d</userinput></screen>
       href="../../xincludes/static-libraries.xml"/>
 
     <para>
-      <parameter>INIT_D_PATH=/tmp/init.d</parameter>: This parameter makes it
-      install its bootscript into <filename>/tmp/init.d</filename>.
+      <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
-      <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>.
+      <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>
 
     <para>
diff --git a/xincludes/static-libraries.xml b/xincludes/static-libraries.xml
index 54e2890722..ba9d543c13 100644
--- a/xincludes/static-libraries.xml
+++ b/xincludes/static-libraries.xml
@@ -6,6 +6,6 @@
      $Date$ -->
 
     <para>
-      <option>--disable-static</option>: This switch prevents 
+      <parameter>--disable-static</parameter>: This switch prevents 
       installation of static versions of the libraries.
     </para>