Index: general.ent
===================================================================
--- general.ent	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general.ent	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "SYSTEMD-&year;-&month;-&day;">
-<!ENTITY releasedate  "June 16th, &year;">
+<!ENTITY releasedate  "June 21st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -381,4 +381,5 @@
 <!ENTITY librep-version               "0.92.2.1">
 <!ENTITY llvm-version                 "3.2">
+<!ENTITY lua-version                  "5.2.2">
 <!ENTITY mercurial-version            "2.6.2">
 <!ENTITY NASM-version                 "2.10.07">
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/genlib/ptlib.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -87,5 +87,5 @@
       <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
       <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
-      <ulink url="http://www.lua.org/">Lua</ulink>,
+      <xref linkend="lua"/>,
       <xref linkend="openldap"/>,
       <xref linkend="pulseaudio"/>,
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/genutils/graphviz.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -111,5 +111,5 @@
       <xref linkend="openjdk"/>,
       <ulink url="http://www.iolanguage.com/about/">Io</ulink>,
-      <ulink url="http://www.lua.org/">Lua</ulink>,
+      <xref linkend="lua"/> (version 5.1),
       <ulink url="http://www.mono-project.com/Main_Page">Mono</ulink>,
       <ulink url="http://ocaml.org/">OCaml</ulink>,
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/graphlib/gegl.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -95,5 +95,5 @@
       <xref linkend="librsvg"/>,
       <ulink url="http://libspiro.sourceforge.net/">libspiro</ulink>,
-      <ulink url="http://www.lua.org/">Lua</ulink>,
+      <xref linkend="lua"/>,
       <ulink url="http://www.openexr.org">OpenEXR</ulink>,
       <xref linkend="pango"/>,
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/graphlib/jasper.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -91,5 +91,5 @@
 
 <screen><userinput>patch -Np1 -i ../jasper-&jasper-version;-security_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr --enable-shared &amp;&amp;
+./configure --prefix=/usr --enable-shared --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -112,9 +112,9 @@
     <title>Command Explanations</title>
 
-    <para><command>--enable-shared</command>: This command
+    <para><option>--enable-shared</option>: This command
     causes the shared library to be built.</para>
 
-    <para><option>--disable-static</option>: This causes the
-    static library to not be built.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para><option>--x-includes=DIR --x-libraries=DIR</option>: These tell the
@@ -151,5 +151,5 @@
       <seglistitem>
         <seg>imgcmp, imginfo, jasper, jiv, and tmrdemo</seg>
-        <seg>libjasper.{so,a}</seg>
+        <seg>libjasper.so</seg>
         <seg>/usr/include/jasper and /usr/share/doc/jasper-&jasper-version;</seg>
       </seglistitem>
@@ -213,10 +213,10 @@
 
       <varlistentry id="jasper-lib">
-        <term><filename class='libraryfile'>libjasper.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libjasper.so</filename></term>
         <listitem>
           <para>a library used by programs for reading and writing
           JPEG2000 format files.</para>
           <indexterm zone="jasper jasper-lib">
-            <primary sortas="c-libjasper">libjasper.{so,a}</primary>
+            <primary sortas="c-libjasper">libjasper.so</primary>
           </indexterm>
         </listitem>
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
+++ general/prog/lua.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY lua-download-http "http://www.lua.org/ftp/lua-&lua-version;.tar.gz">
+  <!ENTITY lua-download-ftp  " ">
+  <!ENTITY lua-md5sum        "efbb645e897eae37cad4344ce8b0a614">
+  <!ENTITY lua-size          "246 KB">
+  <!ENTITY lua-buildsize     "3.5 MB">
+  <!ENTITY lua-time          "0.1 SBU">
+]>
+
+<sect1 id="lua" xreflabel="Lua-&lua-version;">
+  <?dbhtml filename="lua.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Lua-&lua-version;</title>
+
+  <indexterm zone="lua">
+    <primary sortas="a-Lua">Lua</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Lua</title>
+
+    <para>
+      <application>Lua</application> is a powerful light-weight programming
+      language designed for extending applications. It is also frequently used
+      as a general-purpose, stand-alone language. <application>Lua</application>
+      combines simple procedural syntax with powerful data description
+      constructs based on associative arrays and extensible semantics. It is
+      dynamically typed, interpreted from bytecodes, and has automatic memory
+      management with garbage collection, making it ideal for configuration,
+      scripting, and rapid prototyping. A fundamental concept in the design of
+      <application>Lua</application> is to provide meta-mechanisms for
+      implementing features, instead of providing a host of features directly in
+      the language. For example, although <application>Lua</application> is not
+      a pure object-oriented language, it does provide meta-mechanisms for
+      implementing classes and inheritance. <application>Lua</application>'s
+      meta-mechanisms bring an economy of concepts and keep the language small,
+      while allowing the semantics to be extended in unconventional ways.
+      Extensible semantics is a distinguishing feature of
+      <application>Lua</application>. <application>Lua</application> is a
+      language engine that you can embed into your application. This means that,
+      besides syntax and semantics, it has an API that allows the application to
+      exchange data with <application>Lua</application> programs and also to
+      extend <application>Lua</application> with C functions. In this sense, it
+      can be regarded as a language framework for building domain-specific
+      languages. <application>Lua</application> is implemented as a small
+      library of C functions, written in ANSI C, and compiles unmodified in all
+      known platforms. The implementation goals are simplicity, efficiency,
+      portability, and low embedding cost. The result is a fast language engine
+      with small footprint, making it ideal in embedded systems too.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&lua-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&lua-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &lua-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &lua-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &lua-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &lua-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/lua-&lua-version;-shared_library-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/lua"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Lua</title>
+
+    <para>
+      Install <application>Lua</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
+make linux</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.2 liblua.so.5.2.1" \
+     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
+mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
+cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;</userinput></screen>
+
+    <para>Some packages check for the <application>pkg-config</application> file
+    for <application>Lua</application>. As the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/lua.pc &lt;&lt; "EOF"
+<literal>V=5.2
+R=&lua-version;
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          lua and luac
+        </seg>
+        <seg>
+          liblua.so
+        </seg>
+        <seg>
+          /usr/lib/lua,
+          /usr/share/lua and
+          /usr/share/doc/lua-&lua-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="lua-prog">
+        <term><command>lua</command></term>
+        <listitem>
+          <para>
+            is the standalone Lua interpreter.
+          </para>
+          <indexterm zone="lua lua-prog">
+            <primary sortas="b-lua">lua</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="luac">
+        <term><command>luac</command></term>
+        <listitem>
+          <para>
+            is the Lua compiler.
+          </para>
+          <indexterm zone="lua luac">
+            <primary sortas="b-luac">luac</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liblua">
+        <term><filename class="libraryfile">liblua.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Lua</application> API functions.
+          </para>
+          <indexterm zone="lua liblua">
+            <primary sortas="b-liblua">liblua.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/prog/mercurial.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -123,4 +123,34 @@
   </sect2>
 
+  <sect2 role="configuration">
+    <title>Configuring Mercurial</title>
+
+    <sect3 id="mercurial-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/mercurial/hgrc</filename>
+      </para>
+
+      <indexterm zone="mercurial mercurial-config">
+        <primary sortas="e-etc-mercurial-hgrc">/etc/mercurial/hgrc</primary>
+      </indexterm>
+
+      <para>
+        If you have installed the <xref linkend="cacerts"/> and you want
+        <application>Mercurial</application> to use them, as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -d -m755 /etc/mercurial &amp;&amp;
+cat &gt; /etc/mercurial/hgrc &lt;&lt; "EOF"
+<literal>[web]
+cacerts = /etc/ssl/ca-bundle.crt</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -134,5 +164,5 @@
         <seg>hg</seg>
         <seg>none</seg>
-        <seg>/usr/lib/python2.7/site-packages/hgext and
+        <seg>/etc/mercurial, /usr/lib/python2.7/site-packages/hgext and
         /usr/lib/python2.7/site-packages/mercurial</seg>
       </seglistitem>
Index: general/prog/other-tools.xml
===================================================================
--- general/prog/other-tools.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/prog/other-tools.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -1064,50 +1064,4 @@
 
     <sect3 role="package">
-      <title>Lua</title>
-
-      <para><application>Lua</application> is a powerful light-weight
-      programming language designed for extending applications. It is also
-      frequently used as a general-purpose, stand-alone language. It is free
-      software. <application>Lua</application> combines simple procedural
-      syntax with powerful data description constructs based on associative
-      arrays and extensible semantics. It is dynamically typed, interpreted
-      from bytecodes, and has automatic memory management with garbage
-      collection, making it ideal for configuration, scripting, and rapid
-      prototyping. A fundamental concept in the design of
-      <application>Lua</application> is to provide meta-mechanisms for
-      implementing features, instead of providing a host of features directly
-      in the language. For example, although <application>Lua</application> is
-      not a pure object-oriented language, it does provide meta-mechanisms for
-      implementing classes and inheritance. <application>Lua</application>'s
-      meta-mechanisms bring an economy of concepts and keep the language small,
-      while allowing the semantics to be extended in unconventional ways.
-      Extensible semantics is a distinguishing feature of
-      <application>Lua</application>. <application>Lua</application> is a
-      language engine that you can embed into your application. This means
-      that, besides syntax and semantics, it has an API that allows the
-      application to exchange data with <application>Lua</application> programs
-      and also to extend <application>Lua</application> with C functions. In
-      this sense, it can be regarded as a language framework for building
-      domain-specific languages. <application>Lua</application> is implemented
-      as a small library of C functions, written in ANSI C, and compiles
-      unmodified in all known platforms. The implementation goals are
-      simplicity, efficiency, portability, and low embedding cost. The result
-      is a fast language engine with small footprint, making it ideal in
-      embedded systems too.</para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Project Home Page: <ulink
-          url="http://www.lua.org/"/></para>
-        </listitem>
-        <listitem>
-          <para>Download Location: <ulink
-          url="http://www.lua.org/download.html"/></para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="package">
       <title>Mercury</title>
 
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ general/prog/prog.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -40,4 +40,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="llvm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mercurial.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nasm.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ introduction/welcome/changelog.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -45,4 +45,21 @@
 -->
     <listitem>
+      <para>June 19th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Added Lua-5.2.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>June 18th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - patch openssl-1.0.1e and wget-1.14 for perl-5.18.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem>
       <para>June 16th, 2013</para>
       <itemizedlist>
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ multimedia/videoutils/vlc.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -205,5 +205,5 @@
       <ulink url="http://sourceforge.net/projects/medialibrary/">MediaLibrary</ulink>
       (requires <xref linkend="sqlite"/>) and
-      <ulink url="http://www.lua.org/">Lua (version 5.1)</ulink>
+      <xref linkend="lua"/> (version 5.1)
     </para>
 
@@ -256,5 +256,5 @@
 
     <para>
-      <parameter>--disable-dbus</parameter>: The package fails to install if
+      <option>--disable-dbus</option>: The package fails to install if
       <application>D-Bus</application> is missing. Use this switch if you don't
       have <application>D-Bus</application> installed.
Index: networking/netprogs/wget.xml
===================================================================
--- networking/netprogs/wget.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ networking/netprogs/wget.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -73,4 +73,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/wget-&wget-version;-texi2pod-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Wget Dependencies</bridgehead>
 
@@ -100,15 +110,10 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr      \
+<screen><userinput>patch -Np1 -i ../wget-&wget-version;-texi2pod-1.patch &amp;&amp;
+
+./configure --prefix=/usr      \
             --sysconfdir=/etc  \
             --with-ssl=openssl &amp;&amp;
 make</userinput></screen>
-
-    <note>
-      <para><command>make</command> will fail if you have installed Perl version 
-      5.18.0 or later as the <command>pod2man</command> script was changed. This
-      is actually only a warning, and not a fatal error. Running
-      <command>make</command> a second time will terminate correctly.</para>
-    </note>
 
     <para>
Index: networking/netutils/nmap.xml
===================================================================
--- networking/netutils/nmap.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ networking/netutils/nmap.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -71,10 +71,10 @@
     <para role="recommended">
       <xref linkend="libpcap"/>,
-      <xref linkend="pcre"/>,
+      <xref linkend="lua"/>,
+      <xref linkend="pcre"/> and
+      <ulink url="http://www.csie.ntu.edu.tw/~cjlin/liblinear/">liblinear</ulink>
 <!-- This is not recommended, see: http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
-      <ulink url="http://code.google.com/p/libdnet/">libdnet</ulink>,
+      <ulink url="http://code.google.com/p/libdnet/">libdnet</ulink>
 -->
-      <ulink url="http://www.csie.ntu.edu.tw/~cjlin/liblinear/">liblinear</ulink> and
-      <ulink url="http://www.lua.org/">Lua</ulink>
     </para>
 
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ networking/netutils/wireshark.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -102,5 +102,5 @@
       <!-- <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>, -->
       <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink>, and
-      <ulink url="http://www.lua.org/">Lua</ulink>
+      <xref linkend="lua"/>
     </para>
 
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ postlfs/security/openssl.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -80,6 +80,8 @@
       <listitem>
         <para>
-          Required patch:
+          Required patches:
           <ulink url="&patch-root;/openssl-&openssl-version;-fix_parallel_build-1.patch"/>
+          and
+          <ulink url="&patch-root;/openssl-&openssl-version;-fix_pod_syntax-1.patch"/>
         </para>
       </listitem>
@@ -108,4 +110,5 @@
 
 <screen><userinput>patch -Np1 -i ../openssl-&openssl-version;-fix_parallel_build-1.patch &amp;&amp;
+patch -Np1 -i ../openssl-&openssl-version;-fix_pod_syntax-1.patch &amp;&amp;
 
 ./config --prefix=/usr         \
@@ -129,6 +132,5 @@
     </para>
 
-<screen role="root"><userinput>
-make MANDIR=/usr/share/man MANSUFFIX=ssl install &amp;&amp;
+<screen role="root"><userinput>make MANDIR=/usr/share/man MANSUFFIX=ssl install &amp;&amp;
 install -dv -m755 /usr/share/doc/openssl-&openssl-version;  &amp;&amp;
 cp -vfr doc/*     /usr/share/doc/openssl-&openssl-version;</userinput></screen>
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ pst/typesetting/texlive.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -103,5 +103,5 @@
       <ulink url="http://sourceforge.net/projects/zziplib/">ZZIPlib</ulink>,
       <ulink url="http://www.gnu.org/software/clisp/">CLISP</ulink>,
-      <ulink url="http://www.lua.org/">Lua</ulink>,
+      <xref linkend="lua"/>,
       <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>, and
       <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=RenderingGraphite">
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ server/major/apache.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -104,5 +104,5 @@
       <xref linkend="rsync"/>,
       <ulink url="http://www.distcache.org/">Distcache</ulink> and
-      <ulink url="http://www.lua.org/">Lua (5.1)</ulink>
+      <xref linkend="lua"/> (version 5.1)
     </para>
 
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
+++ x/installing/x7driver.xml	(revision a6d9935c0f67fa8fb3304fcf7a3742289bab630f)
@@ -1157,7 +1157,10 @@
           you will need to enable building of r300, r600 and radeonsi Gallium drivers in
           <xref linkend="mesalib"/> instructions. Also, some cards will require Firmware
-          to be available when kernel driver is loaded. Firmware can be obtained from
-          <ulink url="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git">
-          Linux Firmware Repository</ulink>.
+          to be available when the kernel driver is loaded. Firmware can be obtained from
+          <ulink  url="http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/tree/">
+          Linux Firmware</ulink>, either by cloning from
+          git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+          or by using a Linux Firmware source tarball from a distro. See "Kernel
+          Configuration for additional firmware" below.
         </para>
       </note>
@@ -1199,7 +1202,14 @@
       <bridgehead renderas="sect4">Xorg ATI Driver Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="glamor-egl"/>
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="glamor-egl"/> (This is <emphasis>required for "South Islands"
+        GPUs</emphasis> but optional for R300 to R700, Evergreen and "Northern Islands"
+        GPUs - see the link under "Glamor Acceleration" below.)
       </para>
 
@@ -1226,4 +1236,22 @@
     </sect3>
 
+    <sect3 role="kernel" id="xorg-ati-firmware-kernel">
+      <title>Kernel Configuration for additional firmware</title>
+
+    <para>
+      If you need to add firmware, install the file(s) and then point to them in the
+      kernel configuration and recompile the kernel if necessary, e.g. (for a specific
+      R600 with a specific network adaptor which also needs firmware) :
+    </para>
+
+<screen><literal>CONFIG_EXTRA_FIRMWARE="radeon/R600_rlc.bin rtl_nic/rtl8168e-3.fw"
+CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"
+</literal></screen>
+
+      <indexterm zone="xorg-ati-driver xorg-ati-firmware-kernel">
+        <primary sortas="d-xorg-ati-firmware">xorg-ati-firmware</primary>
+      </indexterm>
+    </sect3>
+
     <sect3 role="installation">
       <title>Installation of Xorg ATI Driver</title>
@@ -1253,5 +1281,6 @@
       <para>
         <parameter>--enable-glamor</parameter>: This switch enables
-        new GL-based acceleration.
+        new GL-based acceleration. As well as specifying this in the
+        build, it needs to be enabled at run time (see below).
       </para>
 
@@ -1269,6 +1298,6 @@
         <ulink url="&radeon-marketing-names;">
         Decoder ring for engineering vs marketing names</ulink>. Please note
-        that Glamor acceleration can be used with other chips as well, but
-        it has not been tested recently.
+        that Glamor acceleration can be used with other chips as well, from the
+        R300 onwards, but it has not been tested recently.
       </para>
 
