diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 70e1892f4..464365ca7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -105,6 +105,10 @@ first a summary, then a detailed log.
+June 10, 2004 [alexander]: Reverted the bogus change of package
+order. Removed the "background" line from /etc/vimrc because it matches the
+default on Linux console
+
June 10, 2004 [alexander]: Added a command to autodetect the
character set of files being edited to /etc/vimrc
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index f981c3d33..a99b76af8 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -30,6 +30,7 @@
+
@@ -37,7 +38,6 @@
-
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 66f529bdb..18b810d31 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -51,7 +51,8 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h<
The optional but highly recommended
--enable-multibyte switch
includes support for editing files in multibyte character encodings into
-vim. It is needed for those people who ignore our recommendation not to
+vim.
+It is needed for those people who ignore our recommendation not to
use LFS in locales with multibyte character sets. It is also needed for
people who want to be able to edit text files initially created
in Linux distributions like Fedora Core
@@ -104,7 +105,6 @@ the following:
set nocompatible
set backspace=2
syntax on
-set background=dark
set fileencodings=ucs-bom,utf-8,your-8-bit-charset
" End /etc/vimrc
@@ -116,12 +116,12 @@ vi-compatible manner. Remove the "no" if you want the old vi
behavior. The set backspace=2 allows
backspacing over line breaks, autoindents and the start of insert. The
syntax on enables vim's
-syntax highliting, while set background=dark gives the
-highliting a better color scheme for use on the black background of a linux
-console. If you later use X and terminals with a light background, changing
-this will be useful. The set fileencodings=... makes
-vim capable of detecting the character set of the
-file being edited. This is useful because bleeding-edge distributions
+syntax highliting. The set fileencodings=... makes
+vim capable of automatically detecting the character
+set of the file being edited (replace
+"your-8-bit-charset"
+with the value appropriate for your country, e.g. iso-8859-15 in Italy).
+This line is useful because bleeding-edge distributions
like Fedora Core use UTF-8, and conservative ones like Debian
use traditional 8-bit encodings for text files. If you have not
passed the switch to the