From 36c9064c6834eef4ef687e6cb3bcac6617b57726 Mon Sep 17 00:00:00 2001 From: Larry Lawrence Date: Mon, 25 Aug 2003 01:02:35 +0000 Subject: [PATCH] intro edits, SBU git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@987 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/glib/glib.ent | 2 +- introduction/welcome/changelog.xml | 7 +++++ multimedia/libdriv/alsa/alsa-oss.xml | 3 -- multimedia/libdriv/alsa/alsa.ent | 2 +- postlfs/editors/vim/vim-desc.xml | 14 ++++++++- postlfs/editors/vim/vim-exp.xml | 4 --- postlfs/editors/vim/vim-inst.xml | 8 +++--- postlfs/editors/vim/vim-intro.xml | 43 +++++++++++++++++----------- postlfs/editors/vim/vim.ent | 5 ++-- x/lib/gtk/gtk.ent | 2 +- 10 files changed, 55 insertions(+), 35 deletions(-) diff --git a/general/genlib/glib/glib.ent b/general/genlib/glib/glib.ent index 5cb79a0657..f718fdd3ff 100644 --- a/general/genlib/glib/glib.ent +++ b/general/genlib/glib/glib.ent @@ -8,7 +8,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 390a1c06e9..26dfa9d682 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -10,6 +10,13 @@ page in Chapter 1 for details on who wrote what. +August 24th, 2003 [larry]: updated intro for vim, +docbook and docbook-dsssl. Removed placeholder for +alsa-oss. + +August 24th, 2003 [larry]:; SBU updates for +glib-1, gtk-1, + August 24th, 2003 [larry]: Tag edits on Bill's submission. diff --git a/multimedia/libdriv/alsa/alsa-oss.xml b/multimedia/libdriv/alsa/alsa-oss.xml index 971d6ef5f9..2f8667e722 100644 --- a/multimedia/libdriv/alsa/alsa-oss.xml +++ b/multimedia/libdriv/alsa/alsa-oss.xml @@ -2,9 +2,6 @@ alsa-oss-&alsa-oss-version; -This section is a placeholder for future releases of alsa in which the -oss-compatibility libraries will be used. - &alsa-oss-intro; &alsa-oss-inst; &alsa-oss-config; diff --git a/multimedia/libdriv/alsa/alsa.ent b/multimedia/libdriv/alsa/alsa.ent index 44ff4a279d..eb39fb42f0 100644 --- a/multimedia/libdriv/alsa/alsa.ent +++ b/multimedia/libdriv/alsa/alsa.ent @@ -1,5 +1,5 @@ - + diff --git a/postlfs/editors/vim/vim-desc.xml b/postlfs/editors/vim/vim-desc.xml index fa21d87da5..aef994f488 100644 --- a/postlfs/editors/vim/vim-desc.xml +++ b/postlfs/editors/vim/vim-desc.xml @@ -1,7 +1,19 @@ Contents -The vim package contains eview, evim, ex, gview, gvim, gvimdiff, rgview, rgvim, rview, rvim, view, vim, vimdiff, vimtutor and xxd. Except for vimtutor and xxd, all the other commands are symlinks to vim and start vim with different options. vimtutor is a tool to learn the various vim commands and xxd is a command used to create hex dumps. +The vim package contains +eview, evim, +ex, gview, +gvim, gvimdiff, +rgview, rgvim, +rview, rvim, +view, vim, +vimdiff, vimtutor and +xxd. Except for vimtutor and +xxd, all the other commands are symlinks to +vim and start vim with different +options. vimtutor is a tool to learn the various +vim commands and xxd is a command used to create hex dumps. diff --git a/postlfs/editors/vim/vim-exp.xml b/postlfs/editors/vim/vim-exp.xml index 84de77b540..2c4df10bc8 100644 --- a/postlfs/editors/vim/vim-exp.xml +++ b/postlfs/editors/vim/vim-exp.xml @@ -1,10 +1,6 @@ Command explanations -patch -Np1 -i ../vim-&vim-version;-fhs-compliant-vimrc... : Changes the location of vimrc and -gvimrc from /usr/share to the more -appropriate /etc. - --with-features=huge : Enables all the additional features available in vim. diff --git a/postlfs/editors/vim/vim-inst.xml b/postlfs/editors/vim/vim-inst.xml index 570c85c7af..bd9e7d4c1e 100644 --- a/postlfs/editors/vim/vim-inst.xml +++ b/postlfs/editors/vim/vim-inst.xml @@ -1,12 +1,12 @@ -Installation of vim +Installation of <application>vim</application> -Install vim by running the following commands: +Install vim by running the following commands: -./configure --prefix=/usr \ +./configure --prefix=/usr \ --with-features=huge && make && -make install +make install diff --git a/postlfs/editors/vim/vim-intro.xml b/postlfs/editors/vim/vim-intro.xml index afffdaf67e..63a2fa39ff 100644 --- a/postlfs/editors/vim/vim-intro.xml +++ b/postlfs/editors/vim/vim-intro.xml @@ -1,26 +1,35 @@ -Introduction to Vim +Introduction to <application>Vim</application> -Download location (HTTP): -Download location (FTP): -Version used: &vim-version; -Package size: &vim-size; -Estimated Disk space required: &vim-buildsize; -Estimated build time: &vim-time; +The vim package, which is an +abbreviation for VI IMproved, contains a vi +clone with extra features as compared to the original +vi. -The vim package, which is an abbreviation for VI IMproved, contains a vi -clone with extra features as compared to the original vi. +The default LFS instructions install +LFS as a part of the base system, but +owing to the lack of X libraries during the +base install, vim needs to be +recompiled once X is installed to enable the +GUI mode. There is no need for +special instructions since X support is automatically detected. -vim depends on: - -vim will utilize: -, , and +Package information + +Download (HTTP): +Download (FTP): +Download size: &vim-size; +Estimated Disk space required: &vim-buildsize; +Estimated build time: &vim-time; + -The default LFS instructions install LFS as a part of the base system, but -owing to the lack of X libraries during the base install, vim needs to be -recompiled once X is installed to enable the GUI mode. There is no need for -special instructions since X support is automatically detected. +<application>vim</application> dependencies +Required + +Optional +, , and + diff --git a/postlfs/editors/vim/vim.ent b/postlfs/editors/vim/vim.ent index 8ba973ca95..cfd1c1e5ae 100644 --- a/postlfs/editors/vim/vim.ent +++ b/postlfs/editors/vim/vim.ent @@ -3,10 +3,9 @@ - - + - + diff --git a/x/lib/gtk/gtk.ent b/x/lib/gtk/gtk.ent index 4a76b33b4c..de10480e43 100644 --- a/x/lib/gtk/gtk.ent +++ b/x/lib/gtk/gtk.ent @@ -9,7 +9,7 @@ - +