From 0ba2766b69ef1911d436eaf6cd6be684be50fc74 Mon Sep 17 00:00:00 2001
From: Alex Gronenwoud <alex@linuxfromscratch.org>
Date: Thu, 13 Nov 2003 22:30:39 +0000
Subject: [PATCH] Creating a system-wide vimrc file, as suggested by Greg.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3079 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  |  6 ++++++
 chapter06/config-vim.xml | 25 +++++++++++++++++--------
 chapter06/vim.xml        | 17 +++++++++--------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f6dfdfea2..e89a5d42c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,10 +44,16 @@ symlink.</para></listitem>
 Automake-1.7.9, File-4.06, Modutils-2.4.26, Procps-3.1.14 and
 Sed-4.0.8.</para></listitem>
 
+<listitem><para>November 13th, 2003 [alex]: Chapter 6 - Vim: Changed from
+creating a local <filename>/root/.vimrc</filename> to a system-wide
+<filename>/etc/vimrc</filename> file .</para></listitem>
+
 <listitem><para>November 12th, 2003 [greg]: Upgraded to
 GCC-3.3.2.</para></listitem>
 
 </itemizedlist>
 
+<para>Release of version 5.0 on November 5th, 2003.</para>
+
 </sect1>
 
diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml
index 48a5a05ff..ab9aea8bf 100644
--- a/chapter06/config-vim.xml
+++ b/chapter06/config-vim.xml
@@ -2,19 +2,28 @@
 
 <sect2><title>Configuring Vim</title>
 
-<para>By default, vim runs in vi compatible mode. Some people might like this,
-but we have a high preference to run vim in vim mode (else we wouldn't
-have included vim in this book, but the original vi). Create the
-<filename>/root/.vimrc</filename> by running the following:</para>
+<para>By default, <userinput>vim</userinput> runs in vi-compatible mode. Some
+people might like this, but we prefer to run <userinput>vim</userinput> in its
+own mode (else we wouldn't have included it in this book, but the original
+<userinput>vi</userinput>). Create a default vim configuration file by running
+the following:</para>
 
-<screen><userinput>cat &gt; /root/.vimrc &lt;&lt; "EOF"</userinput>
-" Begin /root/.vimrc
+<screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"</userinput>
+" Begin /etc/vimrc
 
 set nocompatible
-set bs=2
+set backspace=2
+syntax on
 
-" End /root/.vimrc
+" End /etc/vimrc
 <userinput>EOF</userinput></screen>
 
+<para>The <userinput>set nocompatible</userinput> will make
+<userinput>vim</userinput> behave in a more useful way than the default
+vi-compatible manner. The <userinput>set backspace=2</userinput> allows
+backspacing over line breaks, autoindent and the start of insert. And the
+<userinput>syntax on</userinput> switches on <userinput>vim</userinput>'s
+semantic colouring.</para>
+
 </sect2>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index e0efd0ebd..8eb1bb7d2 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -22,7 +22,7 @@ suggested installation instructions.</para>
 <sect2>
 <title>Installation of Vim</title>
 
-<para>Change the default locations of the <filename>vimrc</filename> and
+<para>First change the default locations of the <filename>vimrc</filename> and
 <filename>gvimrc</filename> files to <filename
 class="directory">/etc</filename>.</para>
 
@@ -41,18 +41,19 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Vim can run in old-fashioned <emphasis>vi</emphasis> mode by
-creating a symlink, which may be created with the following command:</para>
+<para>When called as <userinput>vi</userinput>, <userinput>vim</userinput>
+will run in old-fashioned vi-mode. To allow this, create a symlink:</para>
 
 <screen><userinput>ln -s vim /usr/bin/vi</userinput></screen>
 
-<para>If you plan to install the X Window system on your LFS
-system, you might want to re-compile Vim after you have installed X. Vim
-comes with a nice GUI version of the editor which requires X and a few
-other libraries to be installed. For more information read the Vim
-documentation.</para>
+<para>If you are going to install the X Window system on your LFS system, you
+may want to re-compile Vim after having installed X. Vim comes with a nice GUI
+version of the editor that requires X and a few other libraries to be
+installed. For more information read the Vim documentation.</para>
 
 </sect2>
+
 &c6-cf-vim;
+
 </sect1>