Fixed the previous commit. Removed the "background" option from /etc/vimrc

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

3 files changed, 13 insertions, 9 deletions

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.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>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</para></listitem>
+
 <listitem><para>June 10, 2004 [alexander]: Added a command to autodetect the
 character set of files being edited to /etc/vimrc
 </para></listitem>
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 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
 <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"/>
@@ -37,7 +38,6 @@
 <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"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="net-tools.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
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"' &gt;&gt; src/feature.h</userinput><
 <para>The optional but highly recommended
 <userinput>--enable-multibyte</userinput> switch
 includes support for editing files in multibyte character encodings into
-vim. It is needed for those people who ignore our recommendation not to
+<command>vim</command>.
+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:</para>
 set nocompatible
 set backspace=2
 syntax on
-set background=dark
 set fileencodings=ucs-bom,utf-8,<replaceable>your-8-bit-charset</replaceable>
 
 " End /etc/vimrc
@@ -116,12 +116,12 @@ vi-compatible manner. Remove the "no" if you want the old <command>vi</command>
 behavior. The <emphasis>set backspace=2</emphasis> allows
 backspacing over line breaks, autoindents and the start of insert. The
 <emphasis>syntax on</emphasis> enables <command>vim</command>'s
-syntax highliting, while <emphasis>set background=dark</emphasis> 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 <emphasis>set fileencodings=...</emphasis> makes
-<command>vim</command> capable of detecting the character set of the
-file being edited. This is useful because bleeding-edge distributions
+syntax highliting. The <emphasis>set fileencodings=...</emphasis> makes
+<command>vim</command> capable of automatically detecting the character
+set of the file being edited (replace
+"<replaceable>your-8-bit-charset</replaceable>"
+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 <option>--enable-multibyte</option> switch to the