Converted vim to new layout. Added an Alternatives section.

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

9 files changed, 67 insertions, 24 deletions

diff --git a/appendixa/vim-alt.xml b/appendixa/vim-alt.xml
new file mode 100644
index 000000000..d1fe508b7
--- /dev/null
+++ b/appendixa/vim-alt.xml
@@ -0,0 +1,13 @@
+<sect2>
+<title>Alternatives to Vim</title>
+
+<itemizedlist>
+
+  <listitem>
+    <para>emacs, joe and nano</para>
+    <para><ulink url="&blfs-root;view/cvs/postlfs/editors.html"/></para>
+  </listitem>
+
+</itemizedlist>
+
+</sect2>
diff --git a/appendixa/vim-dep.xml b/appendixa/vim-dep.xml
index dc73c1c51..defe63785 100644
--- a/appendixa/vim-dep.xml
+++ b/appendixa/vim-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Vim Installation Dependencies</title>
 
diff --git a/appendixa/vim-desc.xml b/appendixa/vim-desc.xml
index 496c854f2..e252ecff9 100644
--- a/appendixa/vim-desc.xml
+++ b/appendixa/vim-desc.xml
@@ -1,14 +1,10 @@
-<sect2><title>Contents of Vim</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>Last checked against version &vim-contversion;.</para>
+<sect2><title>Descriptions</title>
 
-<sect3><title>Program Files</title>
-<para>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
-pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
-tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
-vimdiff (link to vim), vimm, vimspell.sh, vimtutor and xxd</para></sect3>
+<para>Last checked against version &vim-contversion;.</para>
 
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
 
 <sect4><title>efm_filter.pl</title>
 <para>efm_filter.pl is a filter which reads from stdin, copies to
diff --git a/appendixa/vim-shortdesc.xml b/appendixa/vim-shortdesc.xml
new file mode 100644
index 000000000..29c6062f0
--- /dev/null
+++ b/appendixa/vim-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of Vim</title>
+
+<para>Last checked against version &vim-contversion;.</para>
+
+<para>The Vim package contains a configurable text editor built to
+enable efficient text editing.</para>
+
+<sect3><title>Program Files</title>
+<para>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
+pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
+tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
+vimdiff (link to vim), vimm, vimspell.sh, vimtutor and xxd</para></sect3>
+
+</sect2>
diff --git a/appendixa/vim.xml b/appendixa/vim.xml
index 69a91968e..37d5c5894 100644
--- a/appendixa/vim.xml
+++ b/appendixa/vim.xml
@@ -3,6 +3,8 @@
 <?dbhtml filename="vim.html" dir="appendixa"?>
 
 &aa-vim-down;
+&aa-vim-shortdesc;
+&aa-vim-alt;
 &aa-vim-desc;
 &aa-vim-dep;
 
diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml
index 0e8ad5590..85de1eb4d 100644
--- a/chapter06/vim-inst.xml
+++ b/chapter06/vim-inst.xml
@@ -1,21 +1,36 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Vim</title>
 
 <para>This package requires its patch to be applied before you can
-install it.</para>
+install it. This patch fixes a compile problem with GCC-3.2. Apply
+the patch by issuing the following command:</para>
+
+<para><screen><userinput>patch -Np1 -i ../vim-&vim-patch-version;.patch</userinput></screen></para>
+
+<para>Prepare Vim to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\"</userinput></screen></para>
+
+<para>The <emphasis>CPPFLAGS</emphasis> option above causes vim to look
+for the /etc/vimrc file which contains vim's global settings. Normally,
+this file is assumed to be located in <filename>/usr/share/vim</filename>,
+but we feel that <filename>/etc</filename> is a more logical place for
+this kind of file.</para>
+
+<para>Finish installing the package:</para>
 
-<para>If you not wish to install Vim, build instructions for
-alternative editors are available at
-<ulink url="&blfs-root;view/cvs/postlfs/editors.html"/>.
-Currently, there are instructions for Emacs, nano, and joe.</para>
+<para><screen><userinput>make install</userinput></screen></para>
 
-<para>Install Vim by running the following commands:</para>
+<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><screen><userinput>patch -Np1 -i ../vim-&vim-patch-version;.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
-make install &amp;&amp;
-ln -s vim /usr/bin/vi</userinput></screen></para>
+<para><screen><userinput>ln -s vim /usr/bin/vi</userinput></screen></para>
 
 <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
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 78965faf5..a0c61878f 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &vim-time;
 Estimated required disk space:  &vim-compsize;</screen>
 
-&c6-vim-inst;
-&c6-vim-exp;
-&aa-vim-desc;
+&aa-vim-shortdesc;
+&aa-vim-alt;
 &aa-vim-dep;
+&c6-vim-inst;
 
 </sect1>
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 4b01b3cb8..783fa3e74 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -6,7 +6,6 @@
 
 <!ENTITY c6-gawk SYSTEM "../chapter06/gawk.xml">
 <!ENTITY c6-gawk-inst SYSTEM "../chapter06/gawk-inst.xml">
-<!ENTITY c6-gawk-exp SYSTEM "../chapter06/gawk-exp.xml">
 
 <!ENTITY aa-gawk SYSTEM "../appendixa/gawk.xml">
 <!ENTITY aa-gawk-shortdesc SYSTEM "../appendixa/gawk-shortdesc.xml">
diff --git a/entities/vim.ent b/entities/vim.ent
index 50814e8c6..c8e9661ef 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -7,9 +7,11 @@
 <!ENTITY c6-cf-vim SYSTEM "../chapter06/config-vim.xml">
 
 <!ENTITY aa-vim SYSTEM "../appendixa/vim.xml">
-<!ENTITY aa-vim-desc SYSTEM "../appendixa/vim-desc.xml">
 <!ENTITY aa-vim-dep SYSTEM "../appendixa/vim-dep.xml">
+<!ENTITY aa-vim-desc SYSTEM "../appendixa/vim-desc.xml">
 <!ENTITY aa-vim-down SYSTEM "../appendixa/vim-down.xml">
+<!ENTITY aa-vim-shortdesc SYSTEM "../appendixa/vim-shortdesc.xml">
+<!ENTITY aa-vim-alt SYSTEM "../appendixa/vim-alt.xml">
 
 <!ENTITY vim-version "6.1">
 <!ENTITY vim-depversion "6.0">