Index: general/genlib/iso-codes.xml
===================================================================
--- general/genlib/iso-codes.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
+++ general/genlib/iso-codes.xml	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.bz2">
+  <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "503f79b04d6372f260b7e61ff4b27a70">
-  <!ENTITY iso-codes-size          "9.8 MB">
+  <!ENTITY iso-codes-md5sum        "df8dacc718116dae3db453a4d85c018a">
+  <!ENTITY iso-codes-size          "3.5 MB">
   <!ENTITY iso-codes-buildsize     "110 MB">
-  <!ENTITY iso-codes-time          "0.1 SBU">
+  <!ENTITY iso-codes-time          "0.2 SBU">
 ]>
 
@@ -71,12 +71,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">ISO Codes Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/>
-    </para>
--->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/iso-codes"/>
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision b7d1d2baee73de97fb755b49962d560713f0c8f9)
+++ general/genlib/nspr.xml	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
@@ -6,8 +6,8 @@
 
   <!ENTITY nspr-download-http
-  "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
+           "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
   <!ENTITY nspr-download-ftp
-  "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-  <!ENTITY nspr-md5sum        "d36d7b65a38f5b43ebd50ad3ad227120">
+           "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
+  <!ENTITY nspr-md5sum        "1a8cad110e0ae94f538610a00f595b33">
   <!ENTITY nspr-size          "1.2 MB">
   <!ENTITY nspr-buildsize     "12 MB">
@@ -87,7 +87,9 @@
 <screen><userinput>cd mozilla/nsprpub &amp;&amp;
 sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in &amp;&amp;
-sed -i 's#$(LIBRARY) ##' config/rules.mk                     &amp;&amp;
-./configure --prefix=/usr --with-mozilla --with-pthreads     \
-  $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit)         &amp;&amp;
+sed -i 's#$(LIBRARY) ##' config/rules.mk &amp;&amp;
+./configure --prefix=/usr \
+            --with-mozilla \
+            --with-pthreads \
+            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
 make</userinput></screen>
 
@@ -107,17 +109,17 @@
 
     <para>
-      <parameter>--with-mozilla</parameter>: This parameter adds Mozilla support
-      to the libraries (required if you want to build any other Mozilla products
-      and link them to these libraries).
-    </para>
-
-    <para>
-      <parameter>--with-pthreads</parameter>: This parameter forces use of the
-      system pthreads library.
-    </para>
-
-    <para>
-      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
-      --enable-64bit)</parameter>: The --enable-64bit option is
+      <option>--with-mozilla</option>: This parameter adds Mozilla support
+      to the libraries (required if you want to build any other Mozilla
+      products and link them to these libraries).
+    </para>
+
+    <para>
+      <option>--with-pthreads</option>: This parameter forces use of the
+      system pthread library.
+    </para>
+
+    <para>
+      <option>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
+      --enable-64bit)</option>: The --enable-64bit option is
       <emphasis>required</emphasis> on an x86_64 system to prevent
       <command>configure</command> failing with a claim that this is a system
@@ -128,12 +130,13 @@
     <para>
       <command>sed -ri 's#^(RELEASE_BINS =).*#\1#'
-      pr/src/misc/Makefile.in</command>: This disables installing two unneeded
+      pr/src/misc/Makefile.in</command>: This sed disables installing two unneeded
       scripts.
     </para>
 
     <para>
-      <command>sed -i 's#$(LIBRARY) ##' config/rules.mk</command>: This disables
+      <command>sed -i 's#$(LIBRARY) ##' config/rules.mk</command>: This sed disables
       installing the static libraries.
     </para>
+
   </sect2>
 
@@ -147,7 +150,13 @@
 
       <seglistitem>
-        <seg>nspr-config</seg>
-        <seg>libnspr4.so, libplc4.so, and libplds4.so</seg>
-        <seg>/usr/include/nspr</seg>
+        <seg>
+          nspr-config
+        </seg>
+        <seg>
+          libnspr4.so, libplc4.so and libplds4.so
+        </seg>
+        <seg>
+          /usr/include/nspr
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -210,5 +219,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
-  </sect2>
+
+  </sect2>
+
 </sect1>
