Index: DO
===================================================================
--- TODO	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ 	(revision )
@@ -1,7 +1,0 @@
-User: krejzi
-
-  * Upgrade:
-
-  * lzo-2.06 (Low priority)
-  * tcl-8.5.11
-  * tk-8.5.11
Index: general.ent
===================================================================
--- general.ent	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ general.ent	(revision e8f76067be4ca501af0950bd0a2e8fbf7eb8126b)
@@ -194,5 +194,5 @@
 <!ENTITY enchant-version              "1.6.0">
 <!ENTITY slib-version                 "3b3">
-<!ENTITY LZO-version                  "2.03">
+<!ENTITY LZO-version                  "2.06">
 <!ENTITY libusb-version               "1.0.8">
 <!ENTITY libusb-compat-version        "0.1.3">
@@ -386,6 +386,6 @@
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY spidermonkey-version         "1.0.0">
-<!ENTITY tcl-version                  "8.5.10">
-<!ENTITY tk-version                   "8.5.9">
+<!ENTITY tcl-version                  "8.5.11">
+<!ENTITY tk-version                   "8.5.11">
 <!ENTITY vala-version                 "0.16.0">
 
@@ -464,5 +464,5 @@
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pygobject2-version           "2.28.6">
-<!ENTITY pygobject3-version           "3.2.0">
+<!ENTITY pygobject3-version           "3.2.1">
 <!ENTITY pygtk-version                "2.24.0">
 <!ENTITY pygtksourceview-version      "2.10.1">
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ general/genlib/lzo.xml	(revision e8f76067be4ca501af0950bd0a2e8fbf7eb8126b)
@@ -6,8 +6,8 @@
 
   <!ENTITY LZO-download-http "http://www.oberhumer.com/opensource/lzo/download/lzo-&LZO-version;.tar.gz">
-  <!ENTITY LZO-download-ftp  "ftp://ftp.uni-koeln.de/util/arc/lzo-&LZO-version;.tar.gz">
-  <!ENTITY LZO-md5sum        "0c3d078c2e8ea5a88971089a2f02a726">
-  <!ENTITY LZO-size          "616 KB">
-  <!ENTITY LZO-buildsize     "9.7 MB">
+  <!ENTITY LZO-download-ftp  " ">
+  <!ENTITY LZO-md5sum        "95380bd4081f85ef08c5209f4107e9f8">
+  <!ENTITY LZO-size          "572 KB">
+  <!ENTITY LZO-buildsize     "10 MB">
   <!ENTITY LZO-time          "0.3 SBU (additional 0.3 SBU to run the tests)">
 ]>
@@ -30,7 +30,9 @@
     <title>Introduction to LZO</title>
 
-    <para><application>LZO</application> is a data compression
-    library which is suitable for data decompression and compression in
-    real-time. This means it favors speed over compression ratio.</para>
+    <para>
+      <application>LZO</application> is a data compression
+      library which is suitable for data decompression and compression in
+      real-time. This means it favors speed over compression ratio.
+    </para>
 
     &lfs71_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&LZO-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&LZO-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&LZO-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&LZO-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &LZO-md5sum;</para>
+        <para>
+          Download MD5 sum: &LZO-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &LZO-size;</para>
+        <para>
+          Download size: &LZO-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &LZO-buildsize;</para>
+        <para>
+          Estimated disk space required: &LZO-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &LZO-time;</para>
+        <para>
+          Estimated build time: &LZO-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,19 +80,23 @@
     <title>Installation of LZO</title>
 
-    <para>Install <application>LZO</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>LZO</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. All the
-    checks should pass. Now issue <command>make test</command> to run the full
-    suite of tests.</para>
+    <para>
+      To test the results, issue: <command>make check</command>. All the
+      checks should pass. Now issue <command>make test</command> to run the full
+      suite of tests.
+    </para>
 
-    <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 &amp;&amp;
-install -v -m755 -d /usr/share/doc/lzo-&LZO-version; &amp;&amp;
-install -v -m644 doc/* /usr/share/doc/lzo-&LZO-version;</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -88,12 +106,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>liblzo2.{so,a}</seg>
-        <seg>/usr/include/lzo and /usr/share/doc/lzo-&LZO-version;</seg>
+        <seg>
+          liblzo2.{so,a}
+        </seg>
+        <seg>
+          /usr/include/lzo and 
+          /usr/share/doc/lzo
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -107,5 +128,7 @@
         <term><filename class='libraryfile'>liblzo2.{so,a}</filename></term>
         <listitem>
-          <para>is a data compression and decompression library.</para>
+          <para>
+            is a data compression and decompression library.
+          </para>
           <indexterm zone="LZO liblzo2">
             <primary sortas="c-liblzo2">liblzo2.{so,a}</primary>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ general/prog/python-modules.xml	(revision e8f76067be4ca501af0950bd0a2e8fbf7eb8126b)
@@ -44,6 +44,6 @@
   <!ENTITY pygobject3-download-ftp
   "&gnome-download-ftp;/pygobject/3.2/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-md5sum        "c5b0fd7138df98b42545f41ec043a995">
-  <!ENTITY pygobject3-size          "552 KB">
+  <!ENTITY pygobject3-md5sum        "3f6e63de5aa422710c268b249e2244bf">
+  <!ENTITY pygobject3-size          "540 KB">
   <!ENTITY pygobject3-buildsize     "13 MB">
   <!ENTITY pygobject3-time          "0.2 SBU">
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ general/prog/tcl.xml	(revision e8f76067be4ca501af0950bd0a2e8fbf7eb8126b)
@@ -7,5 +7,5 @@
   <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-download-ftp  "&gentoo-ftp-repo;/tcl&tcl-version;-src.tar.gz">
-  <!ENTITY tcl-md5sum        "a08eaf8467c0631937067c1948dd326b">
+  <!ENTITY tcl-md5sum        "b01a9691c83990b3db0ce62d1012ca67">
   <!ENTITY tcl-size          "4.3 MB">
   <!ENTITY tcl-buildsize     "47 MB (includes documentation installation)">
@@ -13,5 +13,5 @@
 
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
-  <!ENTITY tcl-doc-md5sum    "3b5cf7f3dffe534bda80fb826937034a">
+  <!ENTITY tcl-doc-md5sum    "69cffbda92abfda74c2809091b555548">
   <!ENTITY tcl-doc-size      "912 KB">
 
@@ -37,6 +37,8 @@
     <title>Introduction to Tcl</title>
 
-    <para>The <application>Tcl</application> package contains the Tool Command
-    Language, a robust general-purpose scripting language.</para>
+    <para>
+      The <application>Tcl</application> package contains the Tool Command
+      Language, a robust general-purpose scripting language.
+    </para>
 
     &lfs70_checked;
@@ -45,20 +47,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tcl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tcl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tcl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tcl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tcl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tcl-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&tcl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tcl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tcl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tcl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tcl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tcl-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -68,11 +82,17 @@
       <title>Optional Documentation</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&tcl-doc-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tcl-doc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tcl-doc-size;</para>
+        <para>
+          Download (HTTP): <ulink url="&tcl-doc-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tcl-doc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tcl-doc-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -86,15 +106,21 @@
     <title>Installation of Tcl</title>
 
-    <para>This package is also installed in LFS during the bootstrap phase.
-    As it is not installed during Chapter 6 of LFS, installation instructions
-    are included here in BLFS.</para>
-
-    <para>If you downloaded the optional documentation, unpack the tarball
-    by issuing the following command:</para>
+    <para>
+      This package is also installed in LFS during the bootstrap phase.
+      As it is not installed during Chapter 6 of LFS, installation instructions
+      are included here in BLFS.
+    </para>
+
+    <para>
+      If you downloaded the optional documentation, unpack the tarball
+      by issuing the following command:
+    </para>
 
 <screen><userinput>tar -xf ../tcl&tcl-version;-html.tar.gz --strip-components=1</userinput></screen>
 
-    <para>Install <application>Tcl</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Tcl</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>cd unix &amp;&amp;
@@ -104,12 +130,15 @@
 make &amp;&amp;
 
-sed -i \
-    -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
+sed -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
     -e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    tclConfig.sh</userinput></screen>
-
-    <para>To test the results, issue: <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    -i tclConfig.sh</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 &amp;&amp;
@@ -118,10 +147,12 @@
 chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
 
-    <para>If you downloaded the optional documentation, install it by issuing
-    the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m755 -d           /usr/share/doc/tcl-&tcl-version; &amp;&amp;
-cp      -v -R       ../html/* /usr/share/doc/tcl-&tcl-version;</userinput></screen>
+    <para>
+      If you downloaded the optional documentation, install it by issuing
+      the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mkdir -v -p /usr/share/doc/tcl-&tcl-version; &amp;&amp;
+cp -v -r  ../html/* /usr/share/doc/tcl-&tcl-version;</userinput></screen>
 
   </sect2>
@@ -130,22 +161,30 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-threads</parameter>: This switch forces the package
-    to build with thread support.</para>
-
-    <para><command>make install-private-headers</command>: This command is
-    used to install the <application>Tcl</application> library interface
-    headers used by other packages if they link to the
-    <application>Tcl</application> library.</para>
-
-    <para><command>ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</command>: This
-    command is used to create a compatibility symbolic link to the
-    <command>tclsh&tcl-ver;</command> file as many packages expect a file
-    named <command>tclsh</command>.</para>
-
-    <para><command>sed -i -e ... tclConfig.sh</command>: The
-    <application>Tcl</application> package expects that its source tree is
-    preserved so that packages depending on it for their compilation
-    can utilize it. This <command>sed</command> removes the references to the
-    build directory and replaces them with saner system-wide locations.</para>
+    <para>
+      <option>--enable-threads</option>: This switch forces the package
+      to build with threads support.
+    </para>
+
+    <para>
+      <command>make install-private-headers</command>: This command is
+      used to install the <application>Tcl</application> library interface
+      headers used by other packages if they link to the
+      <application>Tcl</application> library.
+    </para>
+
+    <para>
+      <command>ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</command>: This
+      command is used to create a compatibility symbolic link to the
+      <command>tclsh&tcl-ver;</command> file as many packages expect a file
+      named <command>tclsh</command>.
+    </para>
+
+    <para>
+      <command>sed -e ... tclConfig.sh</command>: The
+      <application>Tcl</application> package expects that its source tree is
+      preserved so that packages depending on it for their compilation
+      can utilize it. This <command>sed</command> removes the references to the
+      build directory and replaces them with saner system-wide locations.
+    </para>
 
   </sect2>
@@ -160,8 +199,16 @@
 
       <seglistitem>
-        <seg>tclsh and tclsh&tcl-ver;</seg>
-        <seg>libtcl&tcl-ver;.so and libtclstub&tcl-ver;.a</seg>
-        <seg>/usr/lib/tcl8, /usr/lib/tcl&tcl-ver;, /usr/share/man/mann,
-        and optionally, /usr/share/doc/&tcl-version;</seg>
+        <seg>
+          tclsh and tclsh&tcl-ver;
+        </seg>
+        <seg>
+          libtcl&tcl-ver;.so and libtclstub&tcl-ver;.a
+        </seg>
+        <seg>
+          /usr/lib/tcl8,
+          /usr/lib/tcl&tcl-ver;,
+          /usr/share/man/mann and optionally
+          /usr/share/doc/&tcl-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -175,6 +222,7 @@
         <term><command>tclsh</command></term>
         <listitem>
-          <para> is a symlink to the <command>tclsh&tcl-ver;</command>
-          program.</para>
+          <para>
+            is a symlink to the <command>tclsh&tcl-ver;</command> program.
+          </para>
           <indexterm zone="tcl tclsh">
             <primary sortas="g-tclsh">tclsh</primary>
@@ -186,6 +234,8 @@
         <term><command>tclsh&tcl-ver;</command></term>
         <listitem>
-          <para> is a simple shell containing the
-          <application>Tcl</application> interpreter.</para>
+          <para>
+            is a simple shell containing the
+            <application>Tcl</application> interpreter.
+          </para>
           <indexterm zone="tcl tclsh-eight">
             <primary sortas="b-tclsh&tcl-ver;">tclsh&tcl-ver;</primary>
@@ -195,10 +245,12 @@
 
       <varlistentry id="libtcl">
-        <term><filename role="library">libtcl.so</filename></term>
+        <term><filename role="library">libtcl&tcl-ver;.so</filename></term>
         <listitem>
-          <para>contains the API functions required
-          by <application>Tcl</application>.</para>
+          <para>
+            contains the API functions required by 
+            <application>Tcl</application>.
+          </para>
           <indexterm zone="tcl libtcl">
-            <primary sortas="c-libtcl">libtcl.so</primary>
+            <primary sortas="c-libtcl">libtcl&tcl-ver;.so</primary>
           </indexterm>
         </listitem>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ general/prog/tk.xml	(revision e8f76067be4ca501af0950bd0a2e8fbf7eb8126b)
@@ -7,7 +7,7 @@
   <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  "&gentoo-ftp-repo;/tk&tk-version;-src.tar.gz">
-  <!ENTITY tk-md5sum        "7cdeb9feb61593f58a0ae61f2497580e">
-  <!ENTITY tk-size          "3.8 MB">
-  <!ENTITY tk-buildsize     "32 MB">
+  <!ENTITY tk-md5sum        "b61b72f0aad230091b100746f078b8f1">
+  <!ENTITY tk-size          "3.7 MB">
+  <!ENTITY tk-buildsize     "28 MB">
   <!ENTITY tk-time          "0.5 SBU">
 
@@ -33,6 +33,8 @@
     <title>Introduction to Tk</title>
 
-    <para>The <application>Tk</application> package contains a
-    TCL GUI Toolkit.</para>
+    <para>
+      The <application>Tk</application> package contains a
+      TCL GUI Toolkit.
+    </para>
 
     &lfs71_checked;
@@ -41,20 +43,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&tk-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tk-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tk-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tk-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tk-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tk-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&tk-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tk-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tk-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tk-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tk-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tk-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -63,6 +77,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/> and
-    <xref linkend="tcl"/></para>
+    <para role="required">
+      <xref linkend="tcl"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -74,6 +90,8 @@
     <title>Installation of Tk</title>
 
-<para>Install <application>Tk</application> by running the following
-commands:</para>
+    <para>
+      Install <application>Tk</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>cd unix &amp;&amp;
@@ -82,20 +100,23 @@
             --mandir=/usr/share/man &amp;&amp;
 make &amp;&amp;
-sed -i \
-    -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
+sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
     -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    tkConfig.sh</userinput></screen>
-
-    <para>Running the tests is not recommended. Some tests may crash your X
-    Server. To test the results anyway, issue: <command>make test</command>.
-    Ensure you run it from an X Window display device with the GLX extensions
-    loaded, otherwise the tests will hang.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    -i tkConfig.sh</userinput></screen>
+
+    <para>
+      Running the tests is not recommended. Some tests may crash your X
+      Server. To test the results anyway, issue: <command>make test</command>.
+      Ensure you run it from an X Window display device with the GLX extensions
+      loaded, otherwise the tests will hang.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
 make install-private-headers &amp;&amp;
 ln -v -sf wish&tk-ver; /usr/bin/wish &amp;&amp;
-chmod -v 755 /usr/lib/libtk8.5.so</userinput></screen>
+chmod -v 755 /usr/lib/libtk&tk-ver;.so</userinput></screen>
 
   </sect2>
@@ -104,22 +125,30 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-threads</parameter>: This switch forces the
-    package to build with thread support.</para>
-
-    <para><command>make install-private-headers</command>: This command is
-    used to install the <application>Tk</application> library interface
-    headers used by other packages if they link to the
-    <application>Tk</application> library.</para>
-
-    <para><command>ln -v -sf wish&tk-ver; /usr/bin/wish</command>: This
-    command is used to create a compatibility symbolic link to the
-    <command>wish&tk-ver;</command> file as many packages expect a file
-    named <command>wish</command>.</para>
-
-    <para><command>sed -i -e ... tkConfig.sh</command>: The
-    <application>Tk</application> package expects that its source tree is
-    preserved so that packages depending on it for their compilation
-    can utilize it. This <command>sed</command> removes the references to the
-    build directory and replaces them with saner system-wide locations.</para>
+    <para>
+      <option>--enable-threads</option>: This switch forces the
+      package to build with thread support.
+    </para>
+
+    <para>
+      <command>make install-private-headers</command>: This command is
+      used to install the <application>Tk</application> library interface
+      headers used by other packages if they link to the
+      <application>Tk</application> library.
+    </para>
+
+    <para>
+      <command>ln -v -sf wish&tk-ver; /usr/bin/wish</command>: This
+      command is used to create a compatibility symbolic link to the
+      <command>wish&tk-ver;</command> file as many packages expect a file
+      named <command>wish</command>.
+    </para>
+
+    <para>
+      <command>sed -e ... tkConfig.sh</command>: The
+      <application>Tk</application> package expects that its source tree is
+      preserved so that packages depending on it for their compilation
+      can utilize it. This <command>sed</command> removes the references to the
+      build directory and replaces them with saner system-wide locations.
+    </para>
 
   </sect2>
@@ -131,10 +160,16 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>wish and wish&tk-ver;</seg>
-        <seg>libtk.so and libtkstub&tk-ver;.a</seg>
-        <seg>/usr/lib/tk&tk-ver;</seg>
+        <seg>
+          wish and wish&tk-ver;
+        </seg>
+        <seg>
+          libtk&tk-ver;.so and libtkstub&tk-ver;.a
+        </seg>
+        <seg>
+          /usr/lib/tk&tk-ver;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -148,6 +183,7 @@
         <term><command>wish</command></term>
         <listitem>
-          <para> is a symlink to the <command>wish&tk-ver;</command>
-          program.</para>
+          <para>
+            is a symlink to the <command>wish&tk-ver;</command> program.
+          </para>
           <indexterm zone="tk wish">
             <primary sortas="g-wish">wish</primary>
@@ -159,7 +195,9 @@
         <term><command>wish&tk-ver;</command></term>
         <listitem>
-          <para> is a simple shell containing the
-          <application>Tk</application> toolkit that creates a main window and
-          then processes <application>Tcl</application> commands.</para>
+          <para>
+            is a simple shell containing the
+            <application>Tk</application> toolkit that creates a main window and
+            then processes <application>Tcl</application> commands.
+          </para>
           <indexterm zone="tk wish-eight">
             <primary sortas="b-wish&tk-ver;">wish&tk-ver;</primary>
@@ -169,10 +207,12 @@
 
       <varlistentry id="libtk">
-        <term><filename role="library">libtk.so</filename></term>
+        <term><filename role="library">libtk&tk-ver;.so</filename></term>
         <listitem>
-          <para>contains the API functions required
-          by <application>Tk</application>.</para>
+          <para>
+            contains the API functions required
+            by <application>Tk</application>.
+          </para>
           <indexterm zone="tk libtk">
-            <primary sortas="c-libtk">libtk.so</primary>
+            <primary sortas="c-libtk">libtk&tk-ver;.so</primary>
           </indexterm>
         </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 92513fe5293e6360a41e0a35d69fbf6b5747b80f)
+++ introduction/welcome/changelog.xml	(revision e8f76067be4ca501af0950bd0a2e8fbf7eb8126b)
@@ -52,4 +52,7 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - LZO 2.06.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Nano 2.3.1.</para>
         </listitem>
@@ -62,4 +65,10 @@
         <listitem>
           <para>[krejzi] - sg3_utils 1.33.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Tcl 8.5.11.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Tk 8.5.11.</para>
         </listitem>
         <listitem>
