misc fixes

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11936 af4574ff-66df-0310-9fd7-8a98e5e911e0

general.ent

@@ -375,7 +375,7 @@ export -f as_root</userinput></screen>
 <!ENTITY guile-version                "2.0.9">
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.3">
-<!ENTITY lua-version                  "5.1.5">
+<!ENTITY lua-version                  "5.2.2">
 <!ENTITY mercurial-version            "2.7.2">
 <!ENTITY NASM-version                 "2.10.09">
 <!ENTITY php-version                  "5.5.4">

general/genutils/graphviz.xml

@@ -134,7 +134,7 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -160,14 +160,6 @@ make</userinput></screen>
 
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
   <sect2 role="configuration">
     <title>Configuring Graphviz</title>
 

multimedia/libdriv/libquicktime.xml

@@ -133,20 +133,20 @@ install -v -m644    README doc/{*.txt,*.html,mainpage.incl} \
     <title>Command Explanations</title>
 
     <para>
-      <option>--with-libdv</option>: Build with libdv support.
-      Not enabled by default.
-    </para>
-
-    <para>
-      <option>--enable-gpl</option>: Changes the licence to GPL. This
+      <parameter>--enable-gpl</parameter>: Changes the licence to GPL. This
       enables some extra plugins, such as FAAC, FAAD2, and x264.
     </para>
 
     <para>
-      <option>--without-doxygen</option>: This is necessary if you do
+      <parameter>--without-doxygen</parameter>: This is necessary if you do
       not have <application>Doxygen</application>, omit this if installed.
     </para>
 
+    <para>
+      <option>--with-libdv</option>: Build with libdv support.
+      Not enabled by default.
+    </para>
+
   </sect2>
 
   <sect2 role="content">

multimedia/videoutils/mplayer.xml

@@ -192,7 +192,8 @@
 
     <bridgehead renderas="sect4">Optional CODECs</bridgehead>
     <para role="optional">
-      <xref linkend="ffmpeg"/>,
+      <!-- includes its own version of FFmpeg which is the recommended one by
+      the devs <xref linkend="ffmpeg"/>, -->
       <xref linkend="libmad"/>,
       <xref linkend="LZO"/>,
       <xref linkend="speex"/>,