Reverting UTF-8 changes until everything is in place.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7236 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

18 files changed, 237 insertions, 574 deletions

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 6c5b872ae..82d457cbb 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -34,7 +34,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="less.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="groff.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>
@@ -56,7 +55,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grub.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hotplug.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="man-db.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="man.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="module-init-tools.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patch.xml"/>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 5c3980f2f..8b06c567b 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -41,26 +41,6 @@ other packages later:</para>
 
 <screen><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
 
-<para>POSIX requires that programs from Coreutils recognize character
-boundaries correctly even in multibyte locales. The following patch
-fixes this non-compliance and other internationalization-related bugs:</para>
-
-<screen><userinput>patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
-
-<para>In order for the tests added by this patch to pass, the permissions for
-the test file have to be changed:</para>
-
-<screen><userinput>chmod +x tests/sort/sort-mb-tests</userinput></screen>
-
-<note><para>In the past, many bugs were found in this patch. When reporting
-new bugs to Coreutils maintainers, please check first if they are reproducible
-without this patch.</para></note>
-
-<para>It has been found that translated messages sometimes overflow a buffer
-in the <command>who -Hu</command> command. Increase the buffer size:</para>
-
-<screen><userinput>sed -i 's,_LEN 6,_LEN 20,' src/who.c</userinput></screen>
-
 <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 016e9f7e0..ade0ece11 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -29,12 +29,6 @@ Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Diffutils</title>
 
-<para>POSIX requires that the <command>diff</command> command treats whitespace
-characters according to the current locale. The following patch fixes the
-non-complinace issue:</para>
-
-<screen><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
-
 <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index d25196e41..41df7f965 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -28,8 +28,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Gawk</title>
 
-<para>Under some circumstances, Gawk-&gawk-version;  attempts to free a chunk
-of memory that was not allocated. This bug is fixed by the following patch:</para>
+<para>Patch Gawk to fix a bug which causes it to segfault when invoked on a
+non-existent file:</para>
 
 <screen><userinput>patch -Np1 -i ../&gawk-segfault-patch;</userinput></screen>
 
@@ -37,15 +37,11 @@ of memory that was not allocated. This bug is fixed by the following patch:</par
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
 
-<para>Due to a bug in the <command>./configure</command> script, Gawk fails
-to detect certain aspects of locale support in glibc. This
-bug leads to, e.g., Gettext testsuite failures. Work around this issue
-by appending the missing macro definitions to <filename>config.h</filename>:</para>
+<para>The configure script doesn't detect some functionality correctly.  The
+following commands correct this problem:</para>
 
-<screen><userinput>cat &gt;&gt;config.h &lt;&lt;"EOF"
-<literal>#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LC_MESSAGES 1</literal>
-EOF</userinput></screen>
+<screen><userinput>echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
+echo "#define HAVE_LC_MESSAGES 1" >> config.h</userinput></screen>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml
deleted file mode 100644
index a2eee4fac..000000000
--- a/chapter06/gdbm.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-gdbm" role="wrap">
-<title>GDBM-&gdbm-version;</title>
-<?dbhtml filename="gdbm.html"?>
-
-<indexterm zone="ch-system-gdbm"><primary sortas="a-Gdbm">GDBM</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The GDBM package contains the GNU Database Manager.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.08 SBU</seg><seg>2.75 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Not checked yet.</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of GDBM</title>
-
-<para>Prepare GDBM for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make BINOWN=root BINGRP=root install install-compat</userinput></screen>
-
-</sect2>
-
-
-<sect2 id="contents-gDBM" role="content"><title>Contents of GDBM</title>
-
-<segmentedlist>
-<segtitle>Installed libraries</segtitle>
-<seglistitem><seg>libgdbm.[so,a] and libgdbm_compat.[so,a]</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="libgdbm">
-<term>libgdbm.[so,a]</term>
-<listitem>
-<para>contains functions to manipulate a hashed database.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libgdbm-compat">
-<term>libgdbm_compat.[so,a]</term>
-<listitem>
-<para>provide compatibility with older dbm routines</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 8ab39c726..c09759789 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -47,21 +47,6 @@ and linker cannot be adjusted before the Glibc install because the
 Glibc autoconf tests would give false results and defeat the goal
 of achieving a clean build.</para>
 
-<para>The glibc-libidn tarball adds support for internationalized
-domain names (IDN) to Glibc. Note that many programs that
-support IDN require the full libidn library from
-<ulink url="http://josefsson.org/libidn/releases/"/>, not this add-on.
-Unpack the tarball from within the Glibc source
-directory:</para>
-
-<screen><userinput>tar jxf ../glibc-libidn-&glibc-version;.tar.bz2</userinput></screen>
-
-<para>In the vi_VN.TCVN locale, bash enters infinite loop at startup. It is
-unknown whether this is a bash bug or a glibc problem. Disable installation
-of this locale in order to avoid the problem:</para>
-
-<screen><userinput>sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
-
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
 
@@ -71,7 +56,7 @@ cd ../glibc-build</userinput></screen>
 <para>Prepare Glibc for compilation:</para>
 
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons=nptl,libidn \
+    --disable-profile --enable-add-ons \
     --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc</userinput></screen>
 
 <para>The meaning of the new configure options:</para>
@@ -144,11 +129,6 @@ with:</para>
 
 <screen><userinput>make localedata/install-locales</userinput></screen>
 
-<note><para>It is possible to create and install additional locales such as
-ru_RU.CP1251 by means of the <command>localedef</command> command, as
-explained in the <filename>INSTALL</filename> file in the Glibc source.</para></note>
-<!-- The Live CD patches the localedata/SUPPORTED file instead of running localedef -->
-
 <para>To save time, an alternative to running the
 previous command (which generates and installs every locale listed in the
 glibc-&glibc-version;/localedata/SUPPORTED file) is to install only those
@@ -162,7 +142,6 @@ instructions, instead of the <parameter>install-locales</parameter>
 target used above, will install the minimum set of locales necessary
 for the tests to run successfully:</para>
 
-<!-- FIXME: recheck that "make localedata/install_locales" actually does the same -->
 <screen role="nodump"><userinput>mkdir -pv /usr/lib/locale
 localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
@@ -173,16 +152,24 @@ localedef -i es_MX -f ISO-8859-1 es_MX
 localedef -i fa_IR -f UTF-8 fa_IR
 localedef -i fr_FR -f ISO-8859-1 fr_FR
 localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i fr_FR.UTF-8 -f UTF-8 fr_FR
 localedef -i it_IT -f ISO-8859-1 it_IT
 localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
 
-<para>The first <command>localedef</command> above combines the
-<filename>/usr/share/i18n/locales/de_DE</filename> charset-independent
-locale definition with the
-<filename>/usr/share/i18n/charmaps/ISO-8859-1.gz</filename> charmap definition
-and appends the result to the
-<filename>/usr/lib/locale/locale-archive</filename> file.</para>
+<para>Some locales installed by the <command>make
+localedata/install-locales</command> command above are not properly
+supported by some applications that are in the LFS and BLFS books.
+Because of the various problems that arise due to application
+programmers making assumptions that break in such locales, LFS should
+not be used in locales that utilize multibyte character sets
+(including UTF-8) or right-to-left writing order.  Numerous unofficial
+and unstable patches are required to fix these problems, and it has
+been decided by the LFS developers not to support such complex locales at this
+time.  This applies to the ja_JP and fa_IR locales as well&mdash;they have been
+installed only for GCC and Gettext tests to pass, and the
+<command>watch</command> program (part of the Procps package) does not work
+properly in them. Various attempts to circumvent these restrictions are
+documented in internationalization-related hints.</para>
+
 </sect2>
 
 <sect2 id="conf-glibc" role="configuration"><title>Configuring Glibc</title>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index b772ad294..8322c6d45 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -28,16 +28,6 @@ Diffutils, GCC, Gettext, Glibc, Make, Sed, and Texinfo</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Grep</title>
 
-<para>The original Grep package has many bugs, especially in the support of
-multibyte locales. RedHat fixed some of them by the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
-
-<para>In order for the tests added by this patch to pass, the permissions for
-the test file have to be changed:</para>
-
-<screen><userinput>chmod +x tests/fmbtest.sh</userinput></screen>
-
 <para>Prepare Grep for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index a8883e930..a2d8cb7e2 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -28,29 +28,10 @@ Gawk, GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Groff</title>
 
-<para>Apply the patch that adds the "ascii8" and "nippon" devices to Groff:</para>
-
-<screen><userinput>zcat ../&groff-debian-patch; | patch -Np1</userinput></screen>
-
-<note><para>These devices are used by Man-DB when formatting non-English manual
-pages that are not in the ISO-8859-1 encoding. There is no working patch for
-Groff-1.19.x that adds this functionality at the time of this writing.
-<!-- Details: http://bugs.debian.org/196762 -->
-</para></note>
-
-<para>Many screen fonts don't have Unicode dashes in them. Tell groff to use
-the ASCII hyphen instead:</para>
-
-<screen><userinput>sed -i 's,2010,002D,' font/devutf8/R.proto
-sed -i 's,2212,002D,' font/devutf8/R.proto</userinput></screen>
-
 <para>Groff expects the environment variable <envar>PAGE</envar>
 to contain the default paper size. For users in the United States,
 <parameter>PAGE=letter</parameter> is appropriate. Elsewhere,
-<parameter>PAGE=A4</parameter> may be more suitable.
-The default paper size can be changed after installation by writing
-the word "A4" or "letter" to the <filename>/etc/papersize</filename>
-file.</para>
+<parameter>PAGE=A4</parameter> may be more suitable.</para>
 
 <para>Prepare Groff for compilation:</para>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 703f959df..52e8a734c 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -28,15 +28,6 @@ Diffutils, Flex, GCC, Gettext, Glibc, Grep, Gzip, M4, Make, and Sed</seg></segli
 <sect2 role="installation">
 <title>Installation of Kbd</title>
 
-<para>The behaviour of Backspace and Delete keys is not consistent across the
-keymaps in the Kbd package. The following patch fixes this issue for
-i386 keymaps:</para>
-
-<screen><userinput>patch -Np1 -i ../&kbd-backspace-patch;</userinput></screen>
-
-<para>After patching, the Backspace key generates the character with code 127,
-and the Delete key generates a well-known escape sequence.</para>
-
 <para>Patch Kbd to fix a bug in <command>setfont</command> that is triggered
 when compiling with GCC-&gcc-version;:</para>
 
@@ -56,11 +47,6 @@ when compiling with GCC-&gcc-version;:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<note>For some languages, e.g. Belarusian, the Kbd package doesn't provide
-a useful keymap (the stock "by" keymap assumes the ISO-8859-5 encoding,
-while everybody uses CP1251 instead). Users of such languages
-have to download working keymaps separately.</note>
-
 </sect2>
 
 <sect2 id="contents-kbd" role="content"><title>Contents of Kbd</title>
@@ -288,9 +274,8 @@ pressed on the keyboard</para>
 <varlistentry id="unicode_start">
 <term><command>unicode_start</command></term>
 <listitem>
-<para>Puts the keyboard and console in UNICODE mode. Don't use this program
-unless your keymap file is in the ISO-8859-1 encoding. For other encodings,
-this utility produces incorrect results.</para>
+<para>Puts the keyboard and console in UNICODE mode. Never use it on LFS, 
+because applications are not configured to support UNICODE.</para>
 <indexterm zone="ch-system-kbd unicode_start"><primary sortas="b-unicode_start">unicode_start</primary></indexterm>
 </listitem>
 </varlistentry>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
deleted file mode 100644
index 13a421a21..000000000
--- a/chapter06/man-db.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-man-db" role="wrap">
-<title>Man-DB-&man-db-version;</title>
-<?dbhtml filename="man-db.html"?>
-
-<indexterm zone="ch-system-man-db"><primary sortas="a-Man-DB">Man-DB</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Man-DB package contains programs for finding and viewing man pages.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>1.1 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Gawk, GCC,
-Glibc, Gettext, GDBM, Grep, Make, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Man-DB</title>
-
-<para>Three adjustments need to be made to the sources of Man-DB.</para>
-
-<para>The first one changes the location of translated manual pages that come
-with Man-DB, in order for them to be accessible in both traditional and
-UTF-8 locales:</para>
-
-<screen><userinput>mv man/de{_DE.88591,} &amp;&amp;
-mv man/es{_ES.88591,} &amp;&amp;
-mv man/it{_IT.88591,} &amp;&amp;
-mv man/ja{_JP.eucJP,} &amp;&amp;
-sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen>
-
-<para>The second change is a sed substitution to delete the
-<quote>/usr/man</quote> lines in the
-<filename>man_db.conf</filename> file to prevent redundant results when
-using programs such as <command>whatis</command>:</para>
-
-<screen><userinput>sed -i '/\t\/usr\/man/d' src/man_db.conf.in</userinput></screen>
-
-<para>The third change accounts for programs that Man-DB should be able
-to find at runtime, but that haven't been installed yet:</para>
-
-<screen><userinput>cat &gt;&gt;include/manconfig.h.in &lt;&lt;"EOF"
-<literal>#define WEB_BROWSER "exec /usr/bin/lynx"
-#define COL "/usr/bin/col"
-#define VGRIND "/usr/bin/vgrind"
-#define GRAP "/usr/bin/grap"</literal>
-EOF</userinput></screen>
-
-<para>The <command>col</command> program is a part of the Util-linux package,
-<command>lynx</command> is a text-based web browser
-(see BLFS for installation instructions),
-<command>vgrind</command> converts program sources to Groff input,
-and <command>grap</command> is useful for typesetting graphs in Groff documents.
-The <command>vgrind</command> and <command>grap</command> programs are
-not normally needed for viewing manual pages. They are
-not part of LFS or BLFS, but you should be able to install them yourself
-after finishing LFS if you wish to do so.</para>
-
-<para>Prepare Man-DB for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --enable-mb-groff --disable-setuid</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--enable-mb-groff</parameter></term>
-<listitem><para>This tells the <command>man</command> program to
-use the "ascii8" and "nippon" Groff devices for formatting non-ISO-8859-1
-manual pages.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term><parameter>--disable-setuid</parameter></term>
-<listitem><para>This disables making the <command>man</command> program
-setuid to user "man".</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-<para>Additional information with regards to the compression of
-man and info pages can be found in the BLFS book at
-<ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>
-
-</sect2>
-
-<sect2><title>Non-English Manual Pages in LFS</title>
-
-<para>Linux distributions have different policies concerning the chracter
-encoding in which manual pages are stored on the hard disk. E.g., RedHat
-stores all manual pages in UTF-8, while Debian uses language-specific
-(mostly 8-bit) encodings. This leads to incompatibility of packages with
-manual pages designed for different distributions.</para>
-
-<para>LFS uses the same conventions as Debian. The correspondence between
-language codes and the expected encoding of manual pages is listed below.
-Man-DB automatically converts them to the locale encoding "on the fly"
-while viewing.</para>
-
-<!-- Origin: man-db-2.4.3/src/encodings.c -->
-<table frame='all'><title>Expected character encoding of manual pages</title>
-<tgroup cols='2' align='center' colsep='1' rowsep='1'>
-<thead>
-<row><entry>Language (code)</entry><entry>Encoding</entry></row>
-</thead>
-<tbody>
-<row><entry>Danish (da)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>German (de)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>English (en)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Spanish (es)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Finnish (fi)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>French (fr)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Irish (ga)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Galician (gl)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Indonesian (id)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Icelandic (is)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Italian (it)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Dutch (nl)</entry><entry>ISO-8859-1</entry></row>
-<!-- BUG: "no" is deprecated, should use "nb" or "nn" and symlinks -->
-<row><entry>Norwegian (no)</entry><entry>ISO-8859-1</entry></row>
-<!-- END BUG -->
-<row><entry>Portuguese (pt)</entry><entry>ISO-8859-1</entry></row>
-<row><entry>Swedish (sv)</entry><entry>ISO-8859-1</entry></row>
-<!-- Languages below require patched groff -->
-<row><entry>Czech (cs)</entry><entry>ISO-8859-2</entry></row>
-<row><entry>Croatian (hr)</entry><entry>ISO-8859-2</entry></row>
-<row><entry>Hungarian (hu)</entry><entry>ISO-8859-2</entry></row>
-<row><entry>Japanese (ja)</entry><entry>EUC-JP</entry></row>
-<row><entry>Korean (ko)</entry><entry>EUC-KR</entry></row>
-<row><entry>Polish (pl)</entry><entry>ISO-8859-2</entry></row>
-<row><entry>Russian (ru)</entry><entry>KOI8-R</entry></row>
-<row><entry>Slovak (sk)</entry><entry>ISO-8859-2</entry></row>
-<row><entry>Turkish (tr)</entry><entry>ISO-8859-9</entry></row>
-</tbody>
-</tgroup>
-</table>
-
-<note><para>Manual pages in languages not in the list are not supported.
-Norwegian doesn't work now because of the transition from no_NO to nb_NO
-locale, and Korean is non-functional because of incomplete Groff patch.
-</para></note>
-
-<para>If upstream distributes the manual pages in the same encoding as
-Man-DB expects, the manual pages can be copied to
-<filename class="directory">/usr/share/man/<replaceable>[language code]</replaceable></filename>.
-E.g., French manual pages
-(<ulink url="http://ccb.club.fr/man/man-fr-1.58.0.tar.bz2"/>)
-can be installed with the following command:</para>
-
-<screen role="nodump"><userinput>mkdir -p /usr/share/man/fr &amp;&amp;
-cp -r man? /usr/share/man/fr</userinput></screen>
-
-<para>If upstream distributes manual pages in UTF-8 (i.e. "for RedHat")
-instead of the encoding listed in the table above, they have to be
-downconverted from UTF-8 to the encoding listed in the table before
-installation. E.g., Spanish manual pages
-(<ulink url="http://ditec.um.es/~piernas/manpages-es/man-pages-es-1.55.tar.bz2"/>)
-can be installed with the following commands:</para>
-
-<screen role="nodump"><userinput>mkdir -p /usr/share/man/es &amp;&amp;
-find man? -type f | \
-grep -v 'man7/iso_8859-2.7' | grep -v 'man7/iso_8859-7.7' | \
-while read F ; do
-	iconv -f UTF-8 -t ISO-8859-1 $F >tmp ; mv tmp $F
-done &amp;&amp;
-cp -r man? /usr/share/man/es</userinput></screen>
-
-<note>The need to exclude <filename>man7/iso_8859-2.7</filename>
-and <filename>man7/iso_8859-7.7</filename> files from the conversion process
-because they are already in ISO-8859-1 is a packaging bug in
-man-pages-es-1.55. Future versions should not require this kludge.</note>
-
-</sect2>
-
-<sect2 id="contents-man-db" role="content"><title>Contents of Man-DB</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>accessdb, apropos, catman, lexgrog, man, mandb, manpath,
-and whatis</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-
-<varlistentry id="accessdb">
-<term><command>accessdb</command></term>
-<listitem>
-<para>Dumps the <command>whatis</command> database contents in human-readable form.</para>
-<indexterm zone="ch-system-man-db accessdb"><primary sortas="b-accessdb">accessdb</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="apropos">
-<term><command>apropos</command></term>
-<listitem>
-<para>Searches the <command>whatis</command> database and displays the short descriptions
-of system commands that contain a given string</para>
-<indexterm zone="ch-system-man-db apropos"><primary sortas="b-apropos">apropos</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="catman">
-<term><command>catman</command></term>
-<listitem>
-<para>Creates or updates the pre-formatted manual pages</para>
-<indexterm zone="ch-system-man-db catman"><primary sortas="b-catman">catman</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="lexgrog">
-<term><command>lexgrog</command></term>
-<listitem>
-<para>Displays one-line summary information about a given manual page.</para>
-<indexterm zone="ch-system-man-db lexgrog"><primary sortas="b-lexgrog">lexgrog</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="man">
-<term><command>man</command></term>
-<listitem>
-<para>Formats and displays the requested on-line man page</para>
-<indexterm zone="ch-system-man-db man"><primary sortas="b-man">man</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mandb">
-<term><command>mandb</command></term>
-<listitem>
-<para>Creates or updates the <command>whatis</command> database</para>
-<indexterm zone="ch-system-man-db mandb"><primary sortas="b-mandb">mandb</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="whatis">
-<term><command>whatis</command></term>
-<listitem>
-<para>Searches the <command>whatis</command> database and displays the short descriptions
-of system commands that contain the given keyword as a separate
-word</para>
-<indexterm zone="ch-system-man-db whatis"><primary sortas="b-whatis">whatis</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
-
diff --git a/chapter06/man.xml b/chapter06/man.xml
index e69de29bb..371985d2e 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-man" role="wrap">
+<title>Man-&man-version;</title>
+<?dbhtml filename="man.html"?>
+
+<indexterm zone="ch-system-man"><primary sortas="a-Man">Man</primary></indexterm>
+
+<sect2 role="package"><title/>
+<para>The Man package contains programs for finding and viewing man pages.</para>
+
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>1.3 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>&dependencies;</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Gawk, GCC,
+Glibc, Grep, Make, and Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
+
+<sect2 role="installation">
+<title>Installation of Man</title>
+
+<para>Two adjustments need to be made to the sources of Man.</para>
+
+<para>The first is a <command>sed</command> substitution to add the
+<parameter>-R</parameter> switch to the <envar>PAGER</envar>
+variable so that escape sequences are properly handled by Less:</para>
+
+<screen><userinput>sed -i 's@-is@&amp;R@g' configure</userinput></screen>
+
+<para>The second is also a <command>sed</command> substitution to comment out the
+<quote>MANPATH /usr/man</quote> line in the
+<filename>man.conf</filename> file to prevent redundant results when
+using programs such as <command>whatis</command>:</para>
+
+<screen><userinput>sed -i 's@MANPATH./usr/man@#&amp;@g' src/man.conf.in</userinput></screen>
+
+<para>Prepare Man for compilation:</para>
+
+<screen><userinput>./configure -confdir=/etc</userinput></screen>
+
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>-confdir=/etc</parameter></term>
+<listitem><para>This tells the <command>man</command> program to look for the
+<filename>man.conf</filename> configuration file in the <filename
+class="directory">/etc</filename> directory.</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>This package does not come with a test suite.</para>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<note><para>If you will be working on a terminal that does not support text
+attributes such as color and bold, you can disable Select Graphic Rendition
+(SGR) escape sequences by editing the <filename>man.conf</filename> file and
+adding the <parameter>-c</parameter> option to the <envar>NROFF</envar>
+variable. If you use multiple terminal types for one computer it may be better
+to selectively add the <envar>GROFF_NO_SGR</envar> environment variable for the
+terminals that do not support SGR.</para></note>
+
+<para>If the character set of the locale uses 8-bit characters, search for the
+line beginning with <quote>NROFF</quote> in <filename>/etc/man.conf</filename>,
+and verify that it matches the following:</para>
+
+<screen>NROFF  /usr/bin/nroff -Tlatin1 -mandoc</screen>
+
+<para>Note that <quote>latin1</quote> should be used even if it is not
+the character set of the locale. The reason is that, according to the
+specification, <command>groff</command> has no means of typesetting
+characters outside International Organization for Standards
+(ISO) 8859-1 without some strange escape codes. When formatting man
+pages, <command>groff</command> thinks that they are in the ISO 8859-1
+encoding and this <parameter>-Tlatin1</parameter> switch tells
+<command>groff</command> to use the same encoding for output. Since
+<command>groff</command> does no recoding of input characters, the
+formatted result is really in the same encoding as input, and therefore
+it is usable as the input for a pager.</para>
+
+<para>This does not solve the problem of a non-working
+<command>man2dvi</command> program for localized man pages in
+non-ISO 8859-1 locales. Also, it does not work with multibyte
+character sets. The first problem does not currently have a solution.
+The second issue is not of concern because the LFS installation does
+not support multibyte character sets.</para>
+
+<para>Additional information with regards to the compression of
+man and info pages can be found in the BLFS book at
+<ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>
+
+</sect2>
+
+
+<sect2 id="contents-man" role="content"><title>Contents of Man</title>
+
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>apropos, makewhatis, man,
+man2dvi, man2html, and whatis</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+<?dbhtml list-presentation="table"?>
+
+<varlistentry id="apropos">
+<term><command>apropos</command></term>
+<listitem>
+<para>Searches the <command>whatis</command> database and displays the short descriptions
+of system commands that contain a given string</para>
+<indexterm zone="ch-system-man apropos"><primary sortas="b-apropos">apropos</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="makewhatis">
+<term><command>makewhatis</command></term>
+<listitem>
+<para>Builds the <command>whatis</command> database; it reads all the man pages
+in the <envar>MANPATH</envar> and writes the name and a short description in the
+<command>whatis</command> database for each page</para>
+<indexterm zone="ch-system-man makewhatis"><primary sortas="b-makewhatis">makewhatis</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="man">
+<term><command>man</command></term>
+<listitem>
+<para>Formats and displays the requested on-line man page</para>
+<indexterm zone="ch-system-man man"><primary sortas="b-man">man</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="man2dvi">
+<term><command>man2dvi</command></term>
+<listitem>
+<para>Converts a man page into dvi format</para>
+<indexterm zone="ch-system-man man2dvi"><primary sortas="b-man2dvi">man2dvi</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="man2html">
+<term><command>man2html</command></term>
+<listitem>
+<para>Converts a man page into HTML</para>
+<indexterm zone="ch-system-man man2html"><primary sortas="b-man2html">man2html</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="whatis">
+<term><command>whatis</command></term>
+<listitem>
+<para>Searches the <command>whatis</command> database and displays the short descriptions
+of system commands that contain the given keyword as a separate
+word</para>
+<indexterm zone="ch-system-man whatis"><primary sortas="b-whatis">whatis</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+</sect1>
+
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index be459b36d..50e2bdc33 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -28,49 +28,10 @@ Gawk, GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
 
 <sect2 role="installation">
 <title>Installation of Ncurses</title>
-<!-- Uncomment if using a dated ncurses release instead of a numbered one.
-
-<para>Since the release of Ncurses-&ncurses-version;, some bugs have been fixed
-and features added. The most important news are .......
-To get these fixes and features, apply the rollup patch:</para>
-
-<screen><userinput>bzcat ../&ncurses-rollup-patch; | patch -Np1</userinput></screen>
--->
-
-<para>Since the release of Ncurses-&ncurses-version;, a memory leak and some
-display bugs were found and fixed upstream. Apply those fixes:</para>
-
-<screen><userinput>patch -Np1 -i ../&ncurses-fixes-patch;</userinput></screen>
 
 <para>Prepare Ncurses for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --with-shared --without-debug --enable-widec</userinput></screen>
-
-<para>The meaning of the configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--enable-widec</parameter></term>
-<listitem><para>This switch causes wide-character libraries
-(e.g. <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
-to be built instead of normal ones
-(e.g. <filename class="libraryfile">libncurses.so.&ncurses-version;</filename>).
-Those wide-character libraries are usable in both multibyte and traditional 8-bit
-locales, while normal libraries work properly only in 8-bit locales.
-Wide-character and normal libraries are source-compatible, but not
-binary-compatible.</para>
-</listitem>
-</varlistentry>
-<!--
-<varlistentry>
-<term><parameter>- -without-cxx-binding</parameter></term>
-<listitem><para>This optional switch causes the
-<filename class="libraryfile">libncurses++w.a</filename> library
-not to be built. Nothing in LFS and BLFS uses this library.</para>
-</listitem>
-</varlistentry>
--->
-</variablelist>
+<screen><userinput>./configure --prefix=/usr --with-shared --without-debug</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -88,48 +49,18 @@ not to be built. Nothing in LFS and BLFS uses this library.</para>
 
 <para>Fix a library that should not be executable:</para>
 
-<screen><userinput>chmod -v 644 /usr/lib/libncurses++w.a</userinput></screen>
+<screen><userinput>chmod -v 644 /usr/lib/libncurses++.a</userinput></screen>
 
 <para>Move the libraries to the <filename class="directory">/lib</filename> directory,
 where they are expected to reside:</para>
 
-<screen><userinput>mv -v /usr/lib/libncursesw.so.5* /lib</userinput></screen>
-
-<para>Because the libraries have been moved, one symlink points to
-a non-existent file. Recreate it:</para>
-
-<screen><userinput>ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen>
-
-<para>Many applications still expect the linker to be able to find
-non-wide-character Ncurses libraries. Trick such applications into linking with
-wide-character libraries by means of symlinks and linker scripts:</para>
-
-<screen><userinput>for lib in curses ncurses form panel menu ; do \
-	rm -vf /usr/lib/lib${lib}.so ; \
-	echo "INPUT(-l${lib}w)" &gt;/usr/lib/lib${lib}.so ; \
-	ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
-done &amp;&amp;
-ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
-
-<para>Finally, make sure that really old applications that look for
-<filename class="libaryfile">-lcurses</filename> at build time are still
-buildable:</para>
-
-<screen><userinput>echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so &amp;&amp;
-ln -sfv libncurses.so /usr/lib/libcurses.so &amp;&amp;
-ln -sfv libncursesw.a /usr/lib/libcursesw.a &amp;&amp;
-ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
-
-<note><para>The instructions above don't create non-wide-character Ncurses
-libraries since nothing in LFS and BLFS would link against them at runtime.
-If you must have such libraries because of some binary-only application,
-build them with the following commands:</para>
-<screen role="nodump"><userinput>make distclean &amp;&amp;
-./configure --prefix=/usr --with-shared --without-normal \
-	--without-debug --without-cxx-binding &amp;&amp;
-make sources libs &amp;&amp;
-cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
-</note>
+<screen><userinput>mv -v /usr/lib/libncurses.so.5* /lib</userinput></screen>
+
+<para>Because the libraries have been moved, a few symlinks point to
+non-existent files. Recreate those symlinks:</para>
+
+<screen><userinput>ln -sfv ../../lib/libncurses.so.5 /usr/lib/libncurses.so
+ln -sfv libncurses.so /usr/lib/libcurses.so</userinput></screen>
 </sect2>
 
 
@@ -140,10 +71,8 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
 <segtitle>Installed libraries</segtitle>
 <seglistitem><seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic), 
 reset (link to tset), tack, tic, toe, tput, and tset</seg>
-<seg>libcursesw.[a,so] (symlink and linker script to libncursesw.[a,so]),
-libformw.[a,so], libmenuw.[a,so], 
-libncurses++w.a, libncursesw.[a,so], libpanelw.[a,so] and their
-non-wide-character counterparts without "w" in the library names.</seg></seglistitem>
+<seg>libcurses.[a,so] (link to libncurses.[a,so]), libform.[a,so], libmenu.[a,so], 
+libncurses++.a, libncurses.[a,so], and libpanel.[a,so]</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -283,3 +212,4 @@ menu displayed during the kernel's <command>make menuconfig</command></para>
 </sect2>
 
 </sect1>
+
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 235f38e8c..5d4e08c29 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -43,9 +43,7 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <varlistentry>
 <term><parameter>SHLIB_LIBS=-lncurses</parameter></term>
 <listitem><para>This option forces Readline to link against the
-<filename class="libraryfile">libncurses</filename>
-(really, <filename class="libraryfile">libncursesw</filename>)
-library.</para></listitem>
+<filename class="libraryfile">libncurses</filename> library.</para></listitem>
 </varlistentry>
 </variablelist>
 
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index c7b1176ff..fb422e1c8 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -33,12 +33,6 @@ Sysklogd with Linux 2.6 series kernels</para>
 
 <screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
 
-<para>The following patch makes sysklogd treat bytes in the 0x80--0x9f range
-literally in the messages being logged, instead of replacing them with octal
-codes. Such replacement caused damage to messages in UTF-8 encoding.</para>
-
-<screen><userinput>patch -Np1 -i ../&sysklogd-8bit-patch;</userinput></screen>
-
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index a82fdd9a8..a322e69ec 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -84,15 +84,26 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
 
 su:S016:once:/sbin/sulogin
 
-1:2345:respawn:/sbin/agetty tty1 9600
-2:2345:respawn:/sbin/agetty tty2 9600
-3:2345:respawn:/sbin/agetty tty3 9600
-4:2345:respawn:/sbin/agetty tty4 9600
-5:2345:respawn:/sbin/agetty tty5 9600
-6:2345:respawn:/sbin/agetty tty6 9600
+1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
+2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
+3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
+4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
+5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
+6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
 
 # End /etc/inittab</literal>
 EOF</userinput></screen>
+
+<para>The <parameter>-I '\033(K'</parameter> option tells
+<command>agetty</command> to send this escape sequence to the terminal
+before doing anything else. This escape sequence switches the console
+character set to a user-defined one, which can be modified by running
+the <command>setfont</command> program. The <command>console</command>
+initscript from the LFS-Bootscripts package calls the <command>setfont</command>
+program during system startup. Sending this escape sequence is
+necessary for people who use non-ISO 8859-1 screen fonts, but it does
+not affect native English speakers.</para>
+
 </sect2>
 
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 0a1ff24c7..fc3138517 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -29,14 +29,6 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Texinfo</title>
 
-<para>The <command>info</command> program makes assumptions such as "a string
-occupies the same number of character cells on the screen and bytes in memory"
-and "one can break the string anywhere" that are incorrect in UTF-8 locales.
-While the patch below is not the proper solution, it at least hides the problem
-by falling back to English messages when a multibyte locale is in use:</para>
-
-<screen><userinput>patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen>
-
 <para>Texinfo allows local users to overwrite arbitrary files via a symlink
 attack on temporary files. Apply the following patch to fix this:</para>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 8b77b1b58..3d89e3187 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -78,7 +78,6 @@ the configuration files here:</para>
 
 <screen><userinput>install -m644 -D -v docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
-<!-- Not for the LiveCD -->
 <!-- Edit Me -->
 <para>Run the <command>udevstart</command> program to create our full
 complement of device nodes.</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index bd21f2f32..2083d4786 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -53,7 +53,7 @@ class="directory">/etc</filename>:</para>
 <variablelist>
 <varlistentry>
 <term><parameter>--enable-multibyte</parameter></term>
-<listitem><para>This switch enables support for
+<listitem><para>This optional but highly recommended switch enables support for
 editing files in multibyte character encodings.  This is needed if using a
 locale with a multibyte character set. This switch is also helpful to be able to
 edit text files initially created in Linux distributions like Fedora Core that
@@ -75,18 +75,6 @@ redirecting the output to a log file.</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>In UTF-8 locales, the <command>vimtutor</command> program
-tries to convert the tutorials from ISO-8859-1 to UTF-8. Since
-some tutorials are not in ISO-8859-1, the text in them is thus made unreadable.
-If you unpacked the <filename>vim-&vim-version;-lang.tar.gz</filename>
-archive and are going to use a UTF-8 based locale, remove non-ISO-8859-1
-tutorials. An English tutorial will be used instead.</para>
-<!-- Removal is used instead of conversion in order for the user to be able to
-painlessly revert his UTF-8 locale choice. -->
-
-<screen><userinput>rm -f /usr/share/vim/vim64/tutor/tutor.{gr,pl,ru,sk}
-rm -f /usr/share/vim/vim64/tutor/tutor.??.*</userinput></screen>
-
 <para>Many users are used to using <command>vi</command> instead of
 <command>vim</command>. To allow execution of <command>vim</command>
 when users habitually enter <command>vi</command>, create a