Index: general.ent
===================================================================
--- general.ent	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ general.ent	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 24th, &year;">
+<!ENTITY releasedate  "January 25th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -170,5 +170,5 @@
 <!ENTITY attr-version                 "2.4.46">
 <!ENTITY consolekit-version           "0.4.6">
-<!ENTITY cracklib-version             "2.8.19">
+<!ENTITY cracklib-version             "2.8.22">
 <!ENTITY cyrus-sasl-version           "2.1.25">
 <!ENTITY gnupg-version                "1.4.12">
@@ -209,5 +209,5 @@
 <!-- Chapter 6 -->
 <!ENTITY bluefish-version             "2.2.3">
-<!ENTITY ed-version                   "1.6">
+<!ENTITY ed-version                   "1.7">
 <!ENTITY emacs-version                "24.2">
 <!ENTITY joe-version                  "3.7">
@@ -372,5 +372,5 @@
 <!ENTITY pciutils-version             "3.1.10">
 <!ENTITY raptor-version               "2.0.8">
-<!ENTITY rasqal-version               "0.9.29">
+<!ENTITY rasqal-version               "0.9.30">
 <!ENTITY redland-version              "1.0.16">
 <!ENTITY sg3_utils-version            "1.34">
@@ -393,5 +393,5 @@
 <!ENTITY cvs-version                  "1.11.23">
 <!ENTITY dejagnu-version              "1.5">
-<!ENTITY doxygen-version              "1.8.2">
+<!ENTITY doxygen-version              "1.8.3.1">
 <!ENTITY expect-version               "5.45">
 <!ENTITY gcc-version                  "4.7.2">
@@ -533,5 +533,5 @@
 <!ENTITY openldap-version             "2.4.33">
 <!ENTITY virtuoso-version             "6.1.6">
-<!ENTITY soprano-version              "2.8.0">
+<!ENTITY soprano-version              "2.9.0">
 <!ENTITY xinetd-version               "2.3.15"> 
 
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ general/prog/doxygen.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -7,7 +7,7 @@
   <!ENTITY doxygen-download-http "http://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-download-ftp  "ftp://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
-  <!ENTITY doxygen-md5sum        "6fa7baf995fa3f71cfc09e264ba88a83">
-  <!ENTITY doxygen-size          "5.8 MB">
-  <!ENTITY doxygen-buildsize     "76 MB">
+  <!ENTITY doxygen-md5sum        "31b0aaab51c5cab7db9f0ebbe9f85530">
+  <!ENTITY doxygen-size          "6.0 MB">
+  <!ENTITY doxygen-buildsize     "86 MB">
   <!ENTITY doxygen-time          "1.4 SBU (includes building the GUI frontend and all docs)">
 ]>
@@ -30,20 +30,24 @@
     <title>Introduction to Doxygen</title>
 
-    <para>The <application>Doxygen</application> package contains a
-    documentation system for C++, C, Java, Objective-C, Corba IDL and to some
-    extent PHP, C# and D. This is useful for generating HTML documentation
-    and/or an off-line reference manual from a set of documented source files.
-    There is also support for generating output in RTF, PostScript, hyperlinked
-    PDF, compressed HTML, and Unix man pages. The documentation is extracted
-    directly from the sources, which makes it much easier to keep the
-    documentation consistent with the source code.</para>
-
-    <para>You can also configure <application>Doxygen</application> to extract
-    the code structure from undocumented source files. This is very useful to
-    quickly find your way in large source distributions. Used along with
-    <application>Graphviz</application>, you can also visualize the relations
-    between the various elements by means of include dependency graphs,
-    inheritance diagrams, and collaboration diagrams, which are all generated
-    automatically.</para>
+    <para>
+      The <application>Doxygen</application> package contains a documentation
+      system for C++, C, Java, Objective-C, Corba IDL and to some extent PHP,
+      C# and D. It is useful for generating HTML documentation and/or an
+      off-line reference manual from a set of documented source files. There
+      is also support for generating output in RTF, PostScript, hyperlinked
+      PDF, compressed HTML, and Unix man pages. The documentation is extracted
+      directly from the sources, which makes it much easier to keep the
+      documentation consistent with the source code.
+    </para>
+
+    <para>
+      You can also configure <application>Doxygen</application> to extract
+      the code structure from undocumented source files. This is very useful
+      to quickly find your way in large source distributions. Used along with
+      <application>Graphviz</application>, you can also visualize the relations
+      between the various elements by means of include dependency graphs,
+      inheritance diagrams, and collaboration diagrams, which are all generated
+      automatically.
+    </para>
 
     &lfs72_checked;
@@ -52,20 +56,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&doxygen-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&doxygen-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &doxygen-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &doxygen-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &doxygen-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &doxygen-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&doxygen-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&doxygen-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &doxygen-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &doxygen-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &doxygen-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &doxygen-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -74,13 +90,15 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="qt"/> (for doxywizard),
-    <xref linkend="graphviz"/>,
-    <xref linkend="python2"/>,  
-    <xref linkend="texlive"/>, and
-    <xref linkend="gs"/></para>
+    <para role="optional">
+      <xref linkend="graphviz"/>,
+      <xref linkend="gs"/>,
+      <xref linkend="python2"/>,
+      <xref linkend="qt"/> (for doxywizard) and
+      <xref linkend="texlive"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/doxygen"/></para>
-
+      <ulink url="&blfs-wiki;/doxygen"/>
+    </para>
   </sect2>
 
@@ -88,6 +106,8 @@
     <title>Installation of Doxygen</title>
 
-    <para>Install <application>Doxygen</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Doxygen</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix /usr \
@@ -95,17 +115,23 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you wish to generate and install the package documentation
-    (note that man pages have already been installed), you must have
-    <application>Python</application>, 
-    <application>TeX Live</application> (for HTML docs) and
-    <application>Ghostscript</application> (for PDF docs)
-    installed, then issue the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      If you wish to generate and install the package documentation
+      (note that man pages have already been installed), you must have
+      <application>Python</application>, 
+      <application>TeX Live</application> (for HTML docs) and
+      <application>Ghostscript</application> (for PDF docs)
+      installed, then issue the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install_docs</userinput></screen>
@@ -116,7 +142,9 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-doxywizard</option>: Use this parameter if
-    <application>Qt</application> is installed and you wish to build the
-    GUI front-end.</para>
+    <para>
+      <option>--with-doxywizard</option>: Use this parameter if
+      <application>Qt</application> is installed and you wish to
+      build the GUI front-end.
+    </para>
 
   </sect2>
@@ -125,12 +153,14 @@
     <title>Configuring Doxygen</title>
 
-    <para>There is no real configuration necessary for the
-    <application>Doxygen</application> package although three additional
-    packages are required if you wish to use extended capabilities. If you need
-    to use the language translation features, you must have <xref
-    linkend="python2"/> installed. If you require formulas to create PDF
-    documentation, then you must have <xref linkend="texlive"/> installed. If
-    you require formulas to convert PostScript files to bitmaps, then you must
-    have <xref linkend="gs"/> installed.</para>
+    <para>
+      There is no real configuration necessary for the
+      <application>Doxygen</application> package although three additional
+      packages are required if you wish to use extended capabilities. If you
+      need to use the language translation features, you must have <xref
+       linkend="python2"/> installed. If you require formulas to create PDF
+      documentation, then you must have <xref linkend="texlive"/> installed.
+      If you require formulas to convert PostScript files to bitmaps, then
+      you must have <xref linkend="gs"/> installed.
+    </para>
 
   </sect2>
@@ -141,11 +171,13 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>doxygen, doxytag, and optionally, doxywizard</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/doxygen</seg>
+        <seg>
+          doxygen and optionally, doxywizard
+        </seg>
+        <seg>
+          /usr/share/doc/doxygen-&doxygen-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -159,8 +191,10 @@
         <term><command>doxygen</command></term>
         <listitem>
-          <para>is a command-line based utility used to generate template
-          configuration files and then generate documentation from these templates. Use
-          <command>doxygen --help</command> for an explanation of the command-line
-          parameters.</para>
+          <para>
+            is a command-line based utility used to generate template
+            configuration files and then generate documentation from these
+            templates. Use <command>doxygen --help</command> for an
+            explanation of the command-line parameters.
+          </para>
           <indexterm zone="doxygen doxygen-prog">
             <primary sortas="b-doxygen">doxygen</primary>
@@ -169,20 +203,11 @@
       </varlistentry>
 
-      <varlistentry id="doxytag">
-        <term><command>doxytag</command></term>
-        <listitem>
-          <para>is used to generate a tag file and/or a search index for a set
-          of HTML files.</para>
-          <indexterm zone="doxygen doxytag">
-            <primary sortas="b-doxytag">doxytag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="doxywizard">
         <term><command>doxywizard</command></term>
         <listitem>
-          <para>is a GUI front-end for configuring and
-          running <command>doxygen</command>.</para>
+          <para>
+            is a GUI front-end for configuring and
+            running <command>doxygen</command>.
+          </para>
           <indexterm zone="doxygen doxywizard">
             <primary sortas="b-doxywizard">doxywizard</primary>
@@ -190,4 +215,5 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
 
Index: general/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ general/sysutils/raptor.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="raptor" xreflabel="raptor-&raptor-version;">
+<sect1 id="raptor" xreflabel="Raptor-&raptor-version;">
   <?dbhtml filename="raptor.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="raptor">
-    <primary sortas="a-raptor">raptor</primary>
+    <primary sortas="a-Raptor">Raptor</primary>
   </indexterm>
 
Index: general/sysutils/rasqal.xml
===================================================================
--- general/sysutils/rasqal.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ general/sysutils/rasqal.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -7,11 +7,11 @@
   <!ENTITY rasqal-download-http "http://download.librdf.org/source/rasqal-&rasqal-version;.tar.gz">
   <!ENTITY rasqal-download-ftp  " ">
-  <!ENTITY rasqal-md5sum        "49e4b75a0c67465edf55dd20606715fa">
+  <!ENTITY rasqal-md5sum        "b12c5f9cfdb6b04efce5a4a186b8416b">
   <!ENTITY rasqal-size          "1.5 MB">
-  <!ENTITY rasqal-buildsize     "18 MB">
+  <!ENTITY rasqal-buildsize     "23 MB">
   <!ENTITY rasqal-time          "0.2 SBU">
 ]>
 
-<sect1 id="rasqal" xreflabel="rasqal-&rasqal-version;">
+<sect1 id="rasqal" xreflabel="Rasqal-&rasqal-version;">
   <?dbhtml filename="rasqal.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="rasqal">
-    <primary sortas="a-rasqal">rasqal</primary>
+    <primary sortas="a-Rasqal">Rasqal</primary>
   </indexterm>
 
@@ -30,9 +30,11 @@
     <title>Introduction to Rasqal</title>
 
-    <para><application>Rasqal</application> is a C library that handles Resource 
-    Description Framework (RDF) query language syntaxes, query construction and 
-    execution of queries returning results as bindings, boolean, RDF graphs/triples 
-    or syntaxes. It is required by <application>Soprano</application> to build 
-    <application>Nepomuk</application>.</para>
+    <para>
+      <application>Rasqal</application> is a C library that handles Resource 
+      Description Framework (RDF) query language syntaxes, query construction and 
+      execution of queries returning results as bindings, boolean, RDF graphs/triples 
+      or syntaxes. It is required by <application>Soprano</application> to build 
+      <application>Nepomuk</application>.
+    </para>
 
     &lfs72_checked;
@@ -41,42 +43,45 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&rasqal-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&rasqal-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&rasqal-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&rasqal-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &rasqal-md5sum;</para>
+        <para>
+          Download MD5 sum: &rasqal-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &rasqal-size;</para>
+        <para>
+          Download size: &rasqal-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &rasqal-buildsize;</para>
+        <para>
+          Estimated disk space required: &rasqal-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &rasqal-time;</para>
+        <para>
+          Estimated build time: &rasqal-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/rasqal-&rasqal-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Rasqal Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="raptor"/>
+      <xref linkend="raptor"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/rasqal"/></para>
-
+      <ulink url="&blfs-wiki;/rasqal"/>
+    </para>
   </sect2>
 
@@ -84,12 +89,15 @@
     <title>Installation of Rasqal</title>
 
-    <para>Install <application>Rasqal</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Rasqal</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -100,6 +108,6 @@
     <title>Command Explanations</title>
     
-    <para><option>--disable-static</option>: This option prevents compiling the 
-    static archive versions of the libraries.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
     
   </sect2>
@@ -110,11 +118,18 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>rasqal-config and roqet</seg>
-        <seg>librasqal.so</seg>
-	<seg>/usr/include/rasqal and /usr/share/gtk-doc/html/rasqal</seg>
+        <seg>
+          rasqal-config and roqet
+        </seg>
+        <seg>
+          librasqal.so
+        </seg>
+	<seg>
+          /usr/include/rasqal and
+          /usr/share/gtk-doc/html/rasqal
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -128,5 +143,8 @@
         <term><command>rasqal-config</command></term>
         <listitem>
-          <para>is a utility for retrieving the installation options of rasqal</para>
+          <para>
+            is a utility for retrieving the installation options
+            of <application>Rasqal</application>.
+          </para>
           <indexterm zone="rasqal rasqal-config">
             <primary sortas="b-rasqal-config">rasqal-config</primary>
@@ -138,5 +156,7 @@
         <term><command>roqet</command></term>
         <listitem>
-          <para>is a RDF query utility.</para>
+          <para>
+            is an RDF query utility.
+          </para>
           <indexterm zone="rasqal roqet">
             <primary sortas="b-roqet">roqet</primary>
Index: gnome/core/libsecret.xml
===================================================================
--- gnome/core/libsecret.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ gnome/core/libsecret.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -92,6 +92,6 @@
     <bridgehead renderas="sect4">Optional (Required for the testsuite)</bridgehead>
     <para role="optional">
-      <xref linkend="gjs"/>,
-      <xref linkend="dbus-python"/> and
+      <xref linkend="dbus-python"/>,
+      <xref linkend="gjs"/> and
       <xref linkend="pygobject3"/>
     </para>
@@ -115,5 +115,5 @@
     <para>
       To test the results, issue: <command>make -k check</command>. The
-      JavaScript tests fail for unknown reasons.
+      JavaScript tests can sometimes fail for unknown reasons.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ introduction/welcome/changelog.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -44,4 +44,24 @@
 
 -->
+    <listitem>
+      <para>January 25th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - CrackLib 2.8.22.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Doxygen 1.8.3.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Ed 1.7.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Rasqal 0.9.30.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Soprano 2.9.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ postlfs/editors/ed.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -7,7 +7,7 @@
   <!ENTITY ed-download-http "http://ftp.gnu.org/pub/gnu/ed/ed-&ed-version;.tar.gz">
   <!ENTITY ed-download-ftp  "ftp://ftp.gnu.org/pub/gnu/ed/ed-&ed-version;.tar.gz">
-  <!ENTITY ed-md5sum        "9a78593decccaa889523aa4bb555ed4b">
-  <!ENTITY ed-size          "92 KB">
-  <!ENTITY ed-buildsize     "140 MB">
+  <!ENTITY ed-md5sum        "0aa4e2428e325203d0d7c3e86c961b1c">
+  <!ENTITY ed-size          "88 KB">
+  <!ENTITY ed-buildsize     "1.4 MB">
   <!ENTITY ed-time          "less than 0.1 SBU">
 ]>
@@ -83,12 +83,4 @@
   </sect2>
 
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--bindir=/bin</parameter>: This parameter places the
-    <command>ed</command> binary into the root filesystem.</para>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>
@@ -96,11 +88,7 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>ed and red</seg>
-        <seg>None</seg>
-        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ postlfs/security/cracklib.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -7,7 +7,7 @@
   <!ENTITY cracklib-download-http "&sourceforge-repo;/cracklib/cracklib-&cracklib-version;.tar.gz">
   <!ENTITY cracklib-download-ftp  "&gentoo-ftp-repo;/cracklib-&cracklib-version;.tar.gz">
-  <!ENTITY cracklib-md5sum        "ca0ec168d9c6466612204e8dfb2df8a9">
-  <!ENTITY cracklib-size          "604 KB">
-  <!ENTITY cracklib-buildsize     "29 MB">
+  <!ENTITY cracklib-md5sum        "463177b5c29c7a598c991e12a4898e06">
+  <!ENTITY cracklib-size          "620 KB">
+  <!ENTITY cracklib-buildsize     "5.2 MB">
   <!ENTITY cracklib-time          "less than 0.1 SBU">
 
@@ -64,5 +64,5 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
+    <itemizedlist spacing="compact">
       <listitem>
         <para>Recommended word list for English-speaking countries (size:
@@ -100,9 +100,11 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python2"/></para>
+    <para role="optional">
+      <xref linkend="python2"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cracklib"/></para>
-
+      <ulink url="&blfs-wiki;/cracklib"/>
+    </para>
   </sect2>
 
@@ -114,5 +116,6 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --with-default-dict=/lib/cracklib/pw_dict &amp;&amp;
+            --with-default-dict=/lib/cracklib/pw_dict \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -128,5 +131,5 @@
     dictionary. Other word lists (text based, one word per line) can also be
     used by simply installing them into
-    <filename class='directory'>/usr/share/dict</filename> and adding them
+    <filename class="directory">/usr/share/dict</filename> and adding them
     to the <command>create-cracklib-dict</command> command.</para>
 
@@ -164,17 +167,20 @@
     This parameter forces the installation of the
     <application>CrackLib</application> dictionary to the
-    <filename class='directory'>/lib</filename> hierarchy.</para>
+    <filename class="directory">/lib</filename> hierarchy.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para><command>mv -v /usr/lib/libcrack.so.2* /lib</command> and
     <command>ln -v -sf ../../lib/libcrack.so.2.8.1 ...</command>: These two
-    commands move the <filename class='libraryfile'>libcrack.so.2.8.1</filename>
+    commands move the <filename class="libraryfile">libcrack.so.2.8.1</filename>
     library and associated symlink from
-    <filename class='directory'>/usr/lib</filename> to
-    <filename class='directory'>/lib</filename>, then recreates the
-    <filename class='symlink'>/usr/lib/libcrack.so</filename> symlink pointing
+    <filename class="directory">/usr/lib</filename> to
+    <filename class="directory">/lib</filename>, then recreates the
+    <filename class="symlink">/usr/lib/libcrack.so</filename> symlink pointing
     to the relocated file.</para>
 
     <para><command>install -v -m644 -D ...</command>: This command creates the
-    <filename class='directory'>/usr/share/dict</filename> directory (if it
+    <filename class="directory">/usr/share/dict</filename> directory (if it
     doesn't already exist) and installs the compressed word list there.</para>
 
@@ -211,5 +217,5 @@
         cracklib-unpacker and create-cracklib-dict</seg>
 
-        <seg>libcrack.so and the _cracklibmodule.{so,a}
+        <seg>libcrack.so and the _cracklibmodule.so
           <application>Python</application> module</seg>
         
@@ -235,5 +241,5 @@
 
       <varlistentry id="libcrack">
-        <term><filename class='libraryfile'>libcrack.so</filename></term>
+        <term><filename class="libraryfile">libcrack.so</filename></term>
         <listitem>
           <para>provides a fast dictionary lookup method for strong
Index: server/other/soprano.xml
===================================================================
--- server/other/soprano.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ server/other/soprano.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -7,11 +7,11 @@
   <!ENTITY soprano-download-http "&sourceforge-repo;/soprano/soprano-&soprano-version;.tar.bz2">
   <!ENTITY soprano-download-ftp  " ">
-  <!ENTITY soprano-md5sum        "273c3403aeb6d8a43e78a4887f50a385">
+  <!ENTITY soprano-md5sum        "90134eaaf40b6663dd01cfaefdaba7fb">
   <!ENTITY soprano-size          "1.9 MB">
-  <!ENTITY soprano-buildsize     "23 MB">
+  <!ENTITY soprano-buildsize     "25 MB">
   <!ENTITY soprano-time          "0.6 SBU">
 ]>
 
-<sect1 id="soprano" xreflabel="soprano-&soprano-version;">
+<sect1 id="soprano" xreflabel="Soprano-&soprano-version;">
   <?dbhtml filename="soprano.html"?>
 
@@ -30,8 +30,10 @@
     <title>Introduction to Soprano</title>
 
-    <para><application>Soprano</application> (formally known as QRDF) is a 
-    library which provides a nice Qt interface to RDF storage solutions. It 
-    has a modular structure which allows to  replace the actual RDF storage 
-    implementation used.</para>
+    <para>
+      <application>Soprano</application> (formally known as QRDF) is a 
+      library which provides a nice Qt interface to RDF storage solutions.
+      It has a modular structure which allows to replace the actual RDF
+      storage  implementation used.
+    </para>
 
     &lfs72_checked;
@@ -40,60 +42,63 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&soprano-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&soprano-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &soprano-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &soprano-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &soprano-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &soprano-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&soprano-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&soprano-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &soprano-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &soprano-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &soprano-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &soprano-time;
+        </para>
       </listitem>
     </itemizedlist>
-<!--
-no longer required in 4.6
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&equinox-download;/soprano-&soprano-version;-redland_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Soprano Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="cmake"/>, 
-    <xref linkend="qt"/>, 
-    <xref linkend="dbus"/> and
-    <xref linkend="redland"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
+      <xref linkend="dbus"/>,
+      <xref linkend="cmake"/>, 
+      <xref linkend="qt"/> and 
+      <xref linkend="redland"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (Required if building KDE)</bridgehead>
     <para role="recommended">
-    <xref linkend="libiodbc"/> (required for the Virtuoso backend. Additionally, 
-    <xref linkend="virtuoso"/> is required as a runtime dependency for this 
-    backend.)
+      <xref linkend="libiodbc"/> (required for the Virtuoso backend. Additionally, 
+      <xref linkend="virtuoso"/> is required as a runtime dependency for this 
+      backend.)
     </para>
     
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="doxygen"/> (to build the documentation), 
-    <ulink url="http://sourceforge.net/projects/clucene/">CLucene</ulink>
-    (no longer required to use soprano in KDE) and 
-    <ulink url="http://www.openrdf.org/">Sesame2</ulink>
+      <xref linkend="doxygen"/> (to build the documentation), 
+      <ulink url="http://sourceforge.net/projects/clucene/">CLucene</ulink>
+      (no longer required to use Soprano in KDE) and 
+      <ulink url="http://www.openrdf.org/">Sesame2</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/soprano"/></para>
-
+      <ulink url="&blfs-wiki;/soprano"/>
+    </para>
   </sect2>
 
@@ -106,8 +111,12 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &amp;&amp;
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
@@ -117,6 +126,15 @@
     <title>Command Explanations</title>
 
-    <para><option>-DSOPRANO_DISABLE_CLUCENE_INDEX=1</option>: Soprano might not 
-    build with recent Clucene versions. Use this option to fix it.</para>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+    <para>
+      <parameter>-DSOPRANO_DISABLE_CLUCENE_INDEX=1</parameter>:
+      <application>Soprano</application> might not  build with recent
+      <application>Clucene</application> versions. Use this switch
+      to fix it.
+    </para>
 
   </sect2>
@@ -125,11 +143,16 @@
     <title>Configuration of Soprano</title>
 
-    <para>Create a directory where <application>soprano</application> places some
-    runtime data:</para>
-    
+    <para>
+      Create a directory where <application>Soprano</application> places some
+      runtime data:
+    </para>
+
 <screen role="root"><userinput>install -m755 -d /srv/soprano</userinput></screen>
 
-    <para>The <application>soprano</application>d accepts some parameter. To not
-    hardcode them in the startscript, create a configuration file:</para>
+    <para>
+      The <command>sopranod</command> accepts some parameters. To configure
+      how the bootscript starts <command>sopranod</command>,
+      create a configuration file:
+    </para>
 
 <screen role="root"><userinput>cat &gt; /etc/sysconfig/soprano &lt;&lt;EOF
@@ -143,17 +166,22 @@
 EOF</userinput></screen>
 
-
 <sect3 id="soprano-init">
       <title>Boot Script</title>
 
       <note>
-      <para>It is not required to start the soprano server at boottime for KDE. 
-      KDE will start soprano as needed.</para>
+        <para>
+          It is not required to start the <application>Soprano</application>
+          server at boottime for <application>KDE</application>. 
+          <application>KDE</application> will start
+          <application>Soprano</application> as needed.
+        </para>
       </note>
       
-      <para>In order to get <application>Soprano</application> started
-      automatically when the system is booted, install the
-      <filename>/etc/rc.d/init.d/soprano</filename> init script included
-      in the <xref linkend="bootscripts"/> package.</para>
+      <para>
+        In order to get <application>Soprano</application> started
+        automatically when the system is booted, install the
+        <filename>/etc/rc.d/init.d/soprano</filename> init script included
+        in the <xref linkend="bootscripts"/> package.
+      </para>
 
       <indexterm zone="soprano soprano-init">
@@ -176,28 +204,19 @@
 
       <seglistitem>
-        <seg>sopranod, sopranocmd and onto2vocabularyclass</seg>
-        <seg>libsoprano.so, libsopranoclient.so, libsopranoserver.so and
-        several libraries in /usr/lib/soprano/</seg>
-	<seg>/usr/include/soprano, /usr/include/Soprano and /usr/share/soprano</seg>
+        <seg>
+          onto2vocabularyclass, sopranocmd and sopranod
+        </seg>
+        <seg>
+          libsopranoclient.so, libsopranoserver.so and libsoprano.so
+        </seg>
+	<seg>
+          /usr/include/soprano,
+          /usr/include/Soprano,
+          /usr/lib/soprano and
+          /usr/share/soprano
+        </seg>
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-soprano">
-        <term><command>soprano</command></term>
-        <listitem>
-          <para>is a testing utility for soprano-generated build trees.</para>
-          <indexterm zone="a-soprano soprano">
-            <primary sortas="b-soprano">soprano</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
+
   </sect2>
 
Index: server/other/virtuoso.xml
===================================================================
--- server/other/virtuoso.xml	(revision 5a464e4d710e72657403d1d9c90210ce7c3454f9)
+++ server/other/virtuoso.xml	(revision 8f1699f25995a53acd36f4187f67af6347533ed6)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="virtuoso" xreflabel="virtuoso-&virtuoso-version;">
+<sect1 id="virtuoso" xreflabel="Virtuoso-&virtuoso-version;">
   <?dbhtml filename="virtuoso.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="virtuoso">
-    <primary sortas="a-virtuoso">virtuoso</primary>
+    <primary sortas="a-Virtuoso">Virtuoso</primary>
   </indexterm>
 
