Index: general.ent
===================================================================
--- general.ent	(revision 57aa7a284664e7de24b319e156f4388e79c078dc)
+++ general.ent	(revision 6eff6e12311aca7494a5e812e48a72beaa863659)
@@ -4,12 +4,12 @@
 -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "January &day;st, &year;">
+<!ENTITY releasedate  "January &day;nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
-<!ENTITY lfs-version  "stable">          <!-- version|stable|testing|unstable|development] -->
+<!ENTITY lfs-version  "6.2">          <!-- version|stable|testing|unstable|development] -->
 <!ENTITY last-commit  "$Date$"> <!-- Automatic update -->
 
@@ -89,5 +89,5 @@
 <!ENTITY ash-version                  "0.4.0">
 <!ENTITY tcsh-version                 "6.14.00">
-<!ENTITY zsh-version                  "4.2.5">
+<!ENTITY zsh-version                  "4.2.6">
 
 <!-- Part III -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 57aa7a284664e7de24b319e156f4388e79c078dc)
+++ introduction/welcome/changelog.xml	(revision 6eff6e12311aca7494a5e812e48a72beaa863659)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>January 22nd, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to ZSH-4.2.6 and added a warning for users
+          with multibyte locales.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 21st, 2007</para>
       <itemizedlist>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 57aa7a284664e7de24b319e156f4388e79c078dc)
+++ postlfs/shells/zsh.xml	(revision 6eff6e12311aca7494a5e812e48a72beaa863659)
@@ -7,8 +7,10 @@
   <!ENTITY zsh-download-http "http://downloads.sourceforge.net/zsh/zsh-&zsh-version;.tar.bz2">
   <!ENTITY zsh-download-ftp  " ">
-  <!ENTITY zsh-md5sum        "e2060f743dcdf3b383e80e862a6548fe">
+  <!ENTITY zsh-md5sum        "2cefebf742c190cbc611baded825db64">
   <!ENTITY zsh-size          "2.0 MB">
-  <!ENTITY zsh-buildsize     "24 MB">
+  <!ENTITY zsh-buildsize     "41 MB (includes installing all documentation)">
   <!ENTITY zsh-time          "0.5 SBU">
+
+  <!ENTITY zsh-doc-md5sum    "3ca3b7c199db6eb942f2a296e3fad270">
 ]>
 
@@ -36,4 +38,14 @@
     <application>KSH</application> but includes many enhancements.</para>
 
+    <warning>
+      <para>This version of <application>ZSH</application> does not work
+      properly with multibyte locales (e.g., UTF-8). A development version
+      is available that addresses many, but not all, locale related issues.
+      You can download the development version from the <ulink
+      url="http://sourceforge.net/project/showfiles.php?group_id=4068">
+      ZSH Sourceforge Download Page</ulink> and use the following BLFS
+      instructions to build and install.</para>
+    </warning>
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -58,4 +70,15 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact"> 
+      <listitem> 
+        <para>Optional Documentation: <ulink
+        url="http://downloads.sourceforge.net/zsh/zsh-&zsh-version;-doc.tar.bz2"/></para>
+      </listitem>
+      <listitem> 
+        <para>MD5 sum: &zsh-doc-md5sum;</para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">ZSH Dependencies</bridgehead>
 
@@ -71,10 +94,27 @@
     <title>Installation of ZSH</title>
 
+    <para>If you downloaded the optional documentation, unpack it the same
+    way you would the source tarball. The documentation will unpack into
+    the <filename class='directory'>Doc</filename> directory of the source
+    tree.</para>
+
     <para>Install <application>ZSH</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc/zsh \
+            --enable-etcdir=/etc/zsh &amp;&amp;
 make</userinput></screen>
 
+    <para>If you downloaded the optional documentation, and you have
+    <xref linkend="tetex"/> installed, you can build additional formats of the
+    documentation by issuing any or all of the following commands:</para>
+
+<screen><userinput>texi2pdf  Doc/zsh.texi -o Doc/zsh.pdf &amp;&amp;
+texi2html Doc/zsh.texi --output=Doc/zsh_1file_t.html &amp;&amp;
+makeinfo  Doc/zsh.texi --html --no-split --no-headers \
+                       -o Doc/zsh_1file_m.html &amp;&amp;
+makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt</userinput></screen>
+
     <para>To test the results, issue: <command>make check</command>.</para>
 
@@ -82,5 +122,32 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-make install.info</userinput></screen>
+make infodir=/usr/share/info install.info</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>make htmldir=/usr/share/doc/zsh-&zsh-version;/html install.html &amp;&amp;
+install -v -m644 Doc/*.{ps,dvi} /usr/share/doc/zsh-&zsh-version;</userinput></screen>
+
+    <para>If you built any additional formats of the documentation, install
+    them by issuing the following command as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m644 Doc/{zsh_1file*,*.{pdf,txt}} \
+        /usr/share/doc/zsh-&zsh-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <para><parameter>--sysconfdir=/etc/zsh</parameter> and
+    <parameter>--enable-etcdir=/etc/zsh</parameter>: These parameters are
+    used so that all the <application>ZSH</application> configuration files
+    are consolidated into the <filename class='directory'>/etc/zsh</filename>
+    directory. Omit these parameters if you wish to retain historical
+    compatibility by having all the files located in the
+    <filename class='directory'>/etc</filename> directory.</para>
 
   </sect2>
@@ -93,28 +160,31 @@
 
       <para>There are a whole host of configuration files for
-      <application>ZSH</application> including <filename>/etc/zshenv</filename>,
-      <filename>/etc/zprofile</filename>, <filename>/etc/zshrc</filename>,
-      <filename>/etc/zlogin</filename>, and <filename>/etc/zlogout</filename>.
+      <application>ZSH</application> including
+      <filename>/etc/zsh/zshenv</filename>,
+      <filename>/etc/zsh/zprofile</filename>,
+      <filename>/etc/zsh/zshrc</filename>,
+      <filename>/etc/zsh/zlogin</filename> and
+      <filename>/etc/zsh/zlogout</filename>.
       You can find more information on these in the <filename>zsh(1)</filename>
-      and related man pages.</para>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zshenv">/etc/zshenv</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zprofile">/etc/zprofile</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zshrc">/etc/zshrc</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zlogin">/etc/zlogin</primary>
-      </indexterm>
-
-      <indexterm zone="zsh zsh-config">
-        <primary sortas="e-etc-zlogout">/etc/zlogout</primary>
+      and related manual pages.</para>
+
+      <indexterm zone="zsh zsh-config">
+        <primary sortas="e-etc-zsh-zshenv">/etc/zsh/zshenv</primary>
+      </indexterm>
+
+      <indexterm zone="zsh zsh-config">
+        <primary sortas="e-etc-zsh-zprofile">/etc/zsh/zprofile</primary>
+      </indexterm>
+
+      <indexterm zone="zsh zsh-config">
+        <primary sortas="e-etc-zsh-zshrc">/etc/zsh/zshrc</primary>
+      </indexterm>
+
+      <indexterm zone="zsh zsh-config">
+        <primary sortas="e-etc-zsh-zlogin">/etc/zsh/zlogin</primary>
+      </indexterm>
+
+      <indexterm zone="zsh zsh-config">
+        <primary sortas="e-etc-zsh-zlogout">/etc/zsh/zlogout</primary>
       </indexterm>
 
@@ -130,5 +200,5 @@
 <screen role="root"><userinput>cat &gt;&gt; /etc/shells &lt;&lt; "EOF"
 <literal>/usr/bin/zsh
-/usr/bin/zsh-4.2.5</literal>
+/usr/bin/zsh-&zsh-version;</literal>
 EOF</userinput></screen>
 
@@ -146,7 +216,8 @@
 
       <seglistitem>
-        <seg>zsh and zsh-4.2.5</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/zsh and /usr/share/zsh</seg>
+        <seg>zsh and zsh-&zsh-version;</seg>
+        <seg>Numerous plugin helper modules</seg>
+        <seg>/etc/zsh, /usr/lib/zsh, /usr/share/doc/zsh-&zsh-version; and
+        /usr/share/zsh</seg>
       </seglistitem>
     </segmentedlist>
