cvs commit: LFS/BOOK/entities lilo.ent man.ent

timothy at linuxfromscratch.org timothy at linuxfromscratch.org
Fri Jan 17 05:18:27 PST 2003


timothy     03/01/17 08:18:27

  Modified:    BOOK/appendixa lilo-dep.xml lilo-desc.xml lilo.xml
                        man-dep.xml man-desc.xml man.xml
               BOOK/chapter06 lilo-inst.xml lilo.xml man-inst.xml man.xml
               BOOK/entities lilo.ent man.ent
  Added:       BOOK/appendixa lilo-shortdesc.xml man-shortdesc.xml
  Removed:     BOOK/chapter06 man-exp.xml
  Log:
  Billy's lilo and man conversion.
  
  Revision  Changes    Path
  1.7       +2 -0      LFS/BOOK/appendixa/lilo-dep.xml
  
  Index: lilo-dep.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/lilo-dep.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- lilo-dep.xml	12 Sep 2002 16:44:20 -0000	1.6
  +++ lilo-dep.xml	17 Jan 2003 13:18:26 -0000	1.7
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Lilo Installation Dependencies</title>
   
  
  
  
  1.7       +4 -5      LFS/BOOK/appendixa/lilo-desc.xml
  
  Index: lilo-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/lilo-desc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- lilo-desc.xml	24 Jun 2002 03:10:38 -0000	1.6
  +++ lilo-desc.xml	17 Jan 2003 13:18:26 -0000	1.7
  @@ -1,11 +1,10 @@
  -<sect2><title>Contents of Lilo</title>
  +<sect2><title> </title><para> </para></sect2>
   
  -<para>Last checked against version &lilo-contversion;.</para>
  +<sect2><title>Descriptions</title>
   
  -<sect3><title>Program Files</title>
  -<para>lilo, mkrescue and keytab-lilo.pl</para></sect3>
  +<para>Last checked against version &lilo-contversion;.</para>
   
  -<sect3><title>Descriptions</title>
  +<sect3><title>Program file descriptions</title>
   
   <sect4><title>lilo</title>
   <para>lilo installs the Linux boot loader which is used to start a Linux
  
  
  
  1.5       +1 -0      LFS/BOOK/appendixa/lilo.xml
  
  Index: lilo.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/lilo.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- lilo.xml	15 Dec 2001 14:28:34 -0000	1.4
  +++ lilo.xml	17 Jan 2003 13:18:26 -0000	1.5
  @@ -3,6 +3,7 @@
   <?dbhtml filename="lilo.html" dir="appendixa"?>
   
   &aa-lilo-down;
  +&aa-lilo-shortdesc;
   &aa-lilo-desc;
   &aa-lilo-dep;
   
  
  
  
  1.8       +2 -0      LFS/BOOK/appendixa/man-dep.xml
  
  Index: man-dep.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/man-dep.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- man-dep.xml	12 Sep 2002 16:44:20 -0000	1.7
  +++ man-dep.xml	17 Jan 2003 13:18:26 -0000	1.8
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Man Installation Dependencies</title>
   
  
  
  
  1.10      +4 -6      LFS/BOOK/appendixa/man-desc.xml
  
  Index: man-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/man-desc.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- man-desc.xml	29 Sep 2002 02:14:06 -0000	1.9
  +++ man-desc.xml	17 Jan 2003 13:18:26 -0000	1.10
  @@ -1,12 +1,10 @@
  -<sect2><title>Contents of Man</title>
  +<sect2><title> </title><para> </para></sect2>
   
  -<para>Last checked against version &man-contversion;.</para>
  +<sect2><title>Description</title>
   
  -<sect3><title>Program Files</title>
  -<para>apropos, makewhatis, man, man2dvi, man2html and
  -whatis</para></sect3>
  +<para>Last checked against version &man-contversion;.</para>
   
  -<sect3><title>Descriptions</title>
  +<sect3><title>Program file descriptions</title>
   
   <sect4><title>apropos</title>
   <para>apropos searches for keywords in a set of database files, containing
  
  
  
  1.5       +1 -0      LFS/BOOK/appendixa/man.xml
  
  Index: man.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/man.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- man.xml	15 Dec 2001 14:28:34 -0000	1.4
  +++ man.xml	17 Jan 2003 13:18:26 -0000	1.5
  @@ -3,6 +3,7 @@
   <?dbhtml filename="man.html" dir="appendixa"?>
   
   &aa-man-down;
  +&aa-man-shortdesc;
   &aa-man-desc;
   &aa-man-dep;
   
  
  
  
  1.1                  LFS/BOOK/appendixa/lilo-shortdesc.xml
  
  Index: lilo-shortdesc.xml
  ===================================================================
  <sect2><title>Contents of Lilo</title>
  
  <para>Last checked against version &lilo-contversion;.</para>
  
  <para>Lilo is the LInux LOader.</para>
  
  <para>Lilo installs the following:</para>
  
  <sect3><title>Program Files</title>
  <para>lilo, mkrescue and keytab-lilo.pl</para></sect3>
  
  </sect2>
  
  
  
  1.1                  LFS/BOOK/appendixa/man-shortdesc.xml
  
  Index: man-shortdesc.xml
  ===================================================================
  <sect2><title>Contents of Man</title>
  
  <para>Last checked against version &man-contversion;.</para>
  
  <para>Man is a man pager.</para>
  
  <para>Man installs the following:</para>
  
  <sect3><title>Program Files</title>
  <para>apropos, makewhatis, man, man2dvi, man2html and
  whatis</para></sect3>
  
  </sect2>
  
  
  
  
  1.20      +8 -3      LFS/BOOK/chapter06/lilo-inst.xml
  
  Index: lilo-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/lilo-inst.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- lilo-inst.xml	28 Sep 2002 21:08:29 -0000	1.19
  +++ lilo-inst.xml	17 Jan 2003 13:18:26 -0000	1.20
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Installation of Lilo</title>
   
  @@ -5,10 +7,13 @@
   may wish to choose another. Fabio Fracassi has written a hint on 
   GRUB, which is available at <ulink url="&hints-root;grub-howto.txt"/>.</para>
   
  -<para>Install Lilo by running the following commands:</para>
  +<para>Compile Lilo:</para>
  +
  +<para><screen><userinput>make</userinput></screen></para>
  +
  +<para>And finish off installing the package:</para>
   
  -<para><screen><userinput>make &&
  -make install</userinput></screen></para>
  +<para><screen><userinput>make install</userinput></screen></para>
   
   <para>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
  
  
  
  1.9       +2 -2      LFS/BOOK/chapter06/lilo.xml
  
  Index: lilo.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/lilo.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- lilo.xml	14 Dec 2001 23:04:46 -0000	1.8
  +++ lilo.xml	17 Jan 2003 13:18:26 -0000	1.9
  @@ -5,8 +5,8 @@
   <screen>Estimated build time:           &lilo-time;
   Estimated required disk space:  &lilo-compsize;</screen>
   
  -&c6-lilo-inst;
  -&aa-lilo-desc;
  +&aa-lilo-shortdesc;
   &aa-lilo-dep;
  +&c6-lilo-inst;
   
   </sect1>
  
  
  
  1.32      +41 -7     LFS/BOOK/chapter06/man-inst.xml
  
  Index: man-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man-inst.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- man-inst.xml	3 Jan 2003 00:21:10 -0000	1.31
  +++ man-inst.xml	17 Jan 2003 13:18:26 -0000	1.32
  @@ -1,22 +1,56 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Installation of Man</title>
   
  -<para>Run the following commands to install man:</para>
   
  -<para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch &&
  +
  +<para>Prepare Man to be compiled:</para>
  +
  +<para><screen><userinput>
  +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</userinput></screen></para>
  +    ./configure -default -confdir=/etc
  +</userinput></screen></para>
  +
  +<para>Continue with compiling the package:</para>
  +
  +<para><screen><userinput>make</userinput></screen></para>
  +
  +<para>And finish off installing the package:</para>
  +
  +<para><screen><userinput>make install</userinput></screen></para>
   
  -<para>Note: If you wish to disable SGR escape sequences, you should
  +<note><para>If you wish to disable SGR escape sequences, you should
   edit the man.conf file and add the <userinput>-c</userinput> argument
  -to nroff.</para>
  +to nroff.</para></note>
   
   <para>You may want to take a look at the man hint 
   at <ulink url="&hints-root;man.txt"/>, which deals with formatting 
   and compression issues for man pages.</para>
   
   </sect2>
  +
  +<sect2>
  +<title>Command explanations</title>
  +
  +<para><userinput>patch...:</userinput>
  +These three patches comment out one of the lines in the
  +<filename>man.conf</filename> file (MANPATH /usr/man) because it will create
  +redundant results when using programs like <userinput>whatis</userinput>.
  +It also adds the <emphasis>-R</emphasis> option to the
  +<emphasis>PAGER</emphasis> 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.</para>
  +
  +<para><userinput>PATH=$PATH:/usr/bin:/bin ./configure -default</userinput>:
  +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.</para>
  +
  +</sect2>
  +
  
  
  
  1.13      +2 -3      LFS/BOOK/chapter06/man.xml
  
  Index: man.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/man.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- man.xml	25 May 2002 00:19:47 -0000	1.12
  +++ man.xml	17 Jan 2003 13:18:26 -0000	1.13
  @@ -5,10 +5,9 @@
   <screen>Estimated build time:           &man-time;
   Estimated required disk space:  &man-compsize;</screen>
   
  -&c6-man-inst;
  -&c6-man-exp;
  -&aa-man-desc;
  +&aa-man-shortdesc;
   &aa-man-dep;
  +&c6-man-inst;
   
   </sect1>
   
  
  
  
  1.6       +1 -0      LFS/BOOK/entities/lilo.ent
  
  Index: lilo.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/lilo.ent,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- lilo.ent	30 Dec 2002 04:32:04 -0000	1.5
  +++ lilo.ent	17 Jan 2003 13:18:27 -0000	1.6
  @@ -6,6 +6,7 @@
   <!ENTITY c8-lilo SYSTEM "../chapter08/lilo.xml">
   
   <!ENTITY aa-lilo SYSTEM "../appendixa/lilo.xml">
  +<!ENTITY aa-lilo-shortdesc SYSTEM "../appendixa/lilo-shortdesc.xml">
   <!ENTITY aa-lilo-desc SYSTEM "../appendixa/lilo-desc.xml">
   <!ENTITY aa-lilo-dep SYSTEM "../appendixa/lilo-dep.xml">
   <!ENTITY aa-lilo-down SYSTEM "../appendixa/lilo-down.xml">
  
  
  
  1.11      +1 -1      LFS/BOOK/entities/man.ent
  
  Index: man.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/man.ent,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- man.ent	3 Jan 2003 00:21:10 -0000	1.10
  +++ man.ent	17 Jan 2003 13:18:27 -0000	1.11
  @@ -3,9 +3,9 @@
   
   <!ENTITY c6-man SYSTEM "../chapter06/man.xml">
   <!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
  -<!ENTITY c6-man-exp SYSTEM "../chapter06/man-exp.xml">
   
   <!ENTITY aa-man SYSTEM "../appendixa/man.xml">
  +<!ENTITY aa-man-shortdesc SYSTEM "../appendixa/man-shortdesc.xml">
   <!ENTITY aa-man-desc SYSTEM "../appendixa/man-desc.xml">
   <!ENTITY aa-man-dep SYSTEM "../appendixa/man-dep.xml">
   <!ENTITY aa-man-down SYSTEM "../appendixa/man-down.xml">
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list