diff --git a/appendixa/lilo-dep.xml b/appendixa/lilo-dep.xml index 5d585ecea..93b119acb 100644 --- a/appendixa/lilo-dep.xml +++ b/appendixa/lilo-dep.xml @@ -1,3 +1,5 @@ +   + Lilo Installation Dependencies diff --git a/appendixa/lilo-desc.xml b/appendixa/lilo-desc.xml index 2cfb5ee9b..0d64959a7 100644 --- a/appendixa/lilo-desc.xml +++ b/appendixa/lilo-desc.xml @@ -1,11 +1,10 @@ -Contents of Lilo +   + +Descriptions Last checked against version &lilo-contversion;. -Program Files -lilo, mkrescue and keytab-lilo.pl - -Descriptions +Program file descriptions lilo lilo installs the Linux boot loader which is used to start a Linux diff --git a/appendixa/lilo-shortdesc.xml b/appendixa/lilo-shortdesc.xml new file mode 100644 index 000000000..11f399e33 --- /dev/null +++ b/appendixa/lilo-shortdesc.xml @@ -0,0 +1,12 @@ +Contents of Lilo + +Last checked against version &lilo-contversion;. + +Lilo is the LInux LOader. + +Lilo installs the following: + +Program Files +lilo, mkrescue and keytab-lilo.pl + + diff --git a/appendixa/lilo.xml b/appendixa/lilo.xml index 66ef90ac2..1bf0392ec 100644 --- a/appendixa/lilo.xml +++ b/appendixa/lilo.xml @@ -3,6 +3,7 @@ &aa-lilo-down; +&aa-lilo-shortdesc; &aa-lilo-desc; &aa-lilo-dep; diff --git a/appendixa/man-dep.xml b/appendixa/man-dep.xml index 59f75a3d4..2cf6131a6 100644 --- a/appendixa/man-dep.xml +++ b/appendixa/man-dep.xml @@ -1,3 +1,5 @@ +   + Man Installation Dependencies diff --git a/appendixa/man-desc.xml b/appendixa/man-desc.xml index 38833d42c..69455ef79 100644 --- a/appendixa/man-desc.xml +++ b/appendixa/man-desc.xml @@ -1,12 +1,10 @@ -Contents of Man +   + +Description Last checked against version &man-contversion;. -Program Files -apropos, makewhatis, man, man2dvi, man2html and -whatis - -Descriptions +Program file descriptions apropos apropos searches for keywords in a set of database files, containing diff --git a/appendixa/man-shortdesc.xml b/appendixa/man-shortdesc.xml new file mode 100644 index 000000000..ef72048d8 --- /dev/null +++ b/appendixa/man-shortdesc.xml @@ -0,0 +1,14 @@ +Contents of Man + +Last checked against version &man-contversion;. + +Man is a man pager. + +Man installs the following: + +Program Files +apropos, makewhatis, man, man2dvi, man2html and +whatis + + + diff --git a/appendixa/man.xml b/appendixa/man.xml index 273312825..63ceb57a0 100644 --- a/appendixa/man.xml +++ b/appendixa/man.xml @@ -3,6 +3,7 @@ &aa-man-down; +&aa-man-shortdesc; &aa-man-desc; &aa-man-dep; diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml index 1ea435aa0..60f87bc9c 100644 --- a/chapter06/lilo-inst.xml +++ b/chapter06/lilo-inst.xml @@ -1,3 +1,5 @@ +   + Installation of Lilo @@ -5,10 +7,13 @@ may wish to choose another. Fabio Fracassi has written a hint on GRUB, which is available at . -Install Lilo by running the following commands: +Compile Lilo: -make && -make install +make + +And finish off installing the package: + +make install It appears that compilation of this package fails on certain machines when the -g compiler flag is used. If you can't compile Lilo at diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml index 64f5829a2..fe4e951c6 100644 --- a/chapter06/lilo.xml +++ b/chapter06/lilo.xml @@ -5,8 +5,8 @@ Estimated build time: &lilo-time; Estimated required disk space: &lilo-compsize; -&c6-lilo-inst; -&aa-lilo-desc; +&aa-lilo-shortdesc; &aa-lilo-dep; +&c6-lilo-inst; diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml deleted file mode 100644 index 8d4f97011..000000000 --- a/chapter06/man-exp.xml +++ /dev/null @@ -1,21 +0,0 @@ - -Command explanations - -PATH=$PATH:/usr/bin:/bin ./configure -default: -The paths to some programs get written into man's files. Unfortunately, the -configure script picks the last location in PATH rather than the first -where a program is found. By appending /usr/bin:/bin to PATH for the -./configure command, we make sure that man doesn't use the /static versions -of our programs. - -patch...: -These three patches comment out one of the lines in the -man.conf file (MANPATH /usr/man) because it will create -redundant results when using programs like whatis. -It also adds the -R option to the -PAGER variable so man pages are displayed properly. -Lastly, the patch fixes the problem where man pages are not formatted with -more than 80 columns when used with the recent groff versions. - - - diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index f07ee1615..4a639b329 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -1,22 +1,56 @@ +   + Installation of Man -Run the following commands to install man: -patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch && + +Prepare Man to be compiled: + + +patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch && patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch && patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch && PATH=$PATH:/usr/bin:/bin \ -    ./configure -default -confdir=/etc && -make && -make install +    ./configure -default -confdir=/etc + -Note: If you wish to disable SGR escape sequences, you should +Continue with compiling the package: + +make + +And finish off installing the package: + +make install + +If you wish to disable SGR escape sequences, you should edit the man.conf file and add the -c argument -to nroff. +to nroff. You may want to take a look at the man hint at , which deals with formatting and compression issues for man pages. + + +Command explanations + +patch...: +These three patches comment out one of the lines in the +man.conf file (MANPATH /usr/man) because it will create +redundant results when using programs like whatis. +It also adds the -R option to the +PAGER variable so man pages are displayed properly. +Lastly, the patch fixes the problem where man pages are not formatted with +more than 80 columns when used with the recent groff versions. + +PATH=$PATH:/usr/bin:/bin ./configure -default: +The paths to some programs get written into man's files. Unfortunately, the +configure script picks the last location in PATH rather than the first +where a program is found. By appending /usr/bin:/bin to PATH for the +./configure command, we make sure that man doesn't use the /static versions +of our programs. + + + diff --git a/chapter06/man.xml b/chapter06/man.xml index 7e0edc3fd..9c0cd7978 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -5,10 +5,9 @@ Estimated build time: &man-time; Estimated required disk space: &man-compsize; -&c6-man-inst; -&c6-man-exp; -&aa-man-desc; +&aa-man-shortdesc; &aa-man-dep; +&c6-man-inst; diff --git a/entities/lilo.ent b/entities/lilo.ent index d7ea1402c..e53b86ed5 100644 --- a/entities/lilo.ent +++ b/entities/lilo.ent @@ -6,6 +6,7 @@ + diff --git a/entities/man.ent b/entities/man.ent index e00e454f2..ca384598c 100644 --- a/entities/man.ent +++ b/entities/man.ent @@ -3,9 +3,9 @@ - +