Changeset 197d9d4


Ignore:
Timestamp:
01/26/2005 06:08:44 AM (19 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.0, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
8d09223
Parents:
caae7a2
Message:

minor fixes to xorg and popt. Change spacing in template for maintainability.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3339 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rcaae7a2 r197d9d4  
    1 <!ENTITY day          "25">
     1<!ENTITY day          "26">
    22<!ENTITY month        "01">
    33<!ENTITY year         "2005">

  • general/genlib/popt.xml

    rcaae7a2 r197d9d4  
    1313
    1414<sect1 id="popt" xreflabel="popt-&popt-version;-5">
     15
    1516<sect1info>
    16 <othername>$LastChangedBy$</othername>
    17 <date>$Date$</date>
     17  <othername>$LastChangedBy$</othername>
     18  <date>$Date$</date>
    1819</sect1info>
     20
    1921<?dbhtml filename="popt.html"?>
     22
    2023<title><application>popt</application>-&popt-version;-5</title>
     24
    2125<indexterm zone="popt">
    22 <primary sortas="a-popt">Popt</primary></indexterm>
     26  <primary sortas="a-popt">Popt</primary>
     27</indexterm>
    2328
    2429<sect2>
    … …  
    3136<sect3><title>Package information</title>
    3237<itemizedlist spacing='compact'>
    33 <listitem><para>Download (HTTP):
    34 <ulink url="&popt-download-http;"/></para></listitem>
    35 <listitem><para>Download (FTP):
    36 <ulink url="&popt-download-ftp;"/></para></listitem>
    37 <listitem><para>Download size: &popt-size;</para></listitem>
    38 <listitem><para>Estimated disk space required:
    39 &popt-buildsize;</para></listitem>
    40 <listitem><para>Estimated build time:
    41 &popt-time;</para></listitem></itemizedlist>
     38  <listitem><para>Download (HTTP):
     39    <ulink url="&popt-download-http;"/></para></listitem>
     40  <listitem><para>Download (FTP):
     41    <ulink url="&popt-download-ftp;"/></para></listitem>
     42  <listitem><para>Download size: &popt-size;</para></listitem>
     43  <listitem><para>Estimated disk space required:
     44    &popt-buildsize;</para></listitem>
     45  <listitem><para>Estimated build time:
     46    &popt-time;</para></listitem>
     47</itemizedlist>
    4248</sect3>
    4349
    4450<sect3><title>Additional downloads</title>
    4551<itemizedlist spacing='compact'>
    46 <listitem><para>Patch level upgrade: <ulink
    47 url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para></listitem>
     52  <listitem><para>Patch level upgrade: <ulink
     53    url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para>
     54  </listitem>
    4855</itemizedlist>
    4956</sect3>
    … …  
    7077 
    7178<para><command>cp configure.in configure.ac</command>:
    72 Because we updated <filename>configure.in</filename> with the patch,
    73 we need to create this file for <command>make</command> to work properly.</para>
     79Because <filename>configure.in</filename> is updated with the patch,
     80this file is needed for <command>make</command> to work properly.</para>
    7481 
    7582<para><command>touch configure.in configure.ac</command>:
    … …  
    8289
    8390<segmentedlist>
    84 <!-- <segtitle>Installed Program</segtitle> -->
    85 <segtitle>Installed Library</segtitle>
    86 <!-- <segtitle>Installed Directories</segtitle> -->
    87 <seglistitem>
    88 <!-- <seg>tclsh</seg> -->
    89 <seg>libpopt</seg>
    90 <!-- <seg>/usr/lib/tcl8.4 and /usr/include/tcl8.4</seg> -->
    91 </seglistitem>
     91  <segtitle>Installed Library</segtitle>
     92  <seglistitem>
     93    <seg>libpopt</seg>
     94  </seglistitem>
    9295</segmentedlist>
    9396
    9497<variablelist>
    95 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    96 <?dbfo list-presentation="list"?>
     98  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     99  <?dbfo list-presentation="list"?>
    97100
    98 <varlistentry id="libpopt">
    99 <term><filename role='library'>libpopt.so</filename></term>
    100 <listitem><para> is used to parse command-line options.</para>
    101 <indexterm zone="popt libpopt">
    102 <primary sortas="c-libpopt">libpopt</primary></indexterm>
    103 </listitem>
    104 </varlistentry>
     101  <varlistentry id="libpopt">
     102  <term><filename role='library'>libpopt.so</filename></term>
     103  <listitem>
     104    <para> is used to parse command-line options.</para>
     105    <indexterm zone="popt libpopt">
     106      <primary sortas="c-libpopt">libpopt</primary>
     107     </indexterm>
     108  </listitem>
     109  </varlistentry>
    105110</variablelist>
    106111

  • introduction/welcome/changelog.xml

    rcaae7a2 r197d9d4  
    2222
    2323<itemizedlist>
     24
     25<listitem><para>January 26th, 2005 [bdubbs]: Added directory reference
     26for xorg downloads.</para></listitem>
     27
     28<listitem><para>January 26th, 2005 [bdubbs]: Fixed policy command line in
     29tripwire.</para></listitem>
    2430
    2531<listitem><para>January 25th, 2005 [randy]: Modified dependency list and added

  • postlfs/security/tripwire.xml

    rcaae7a2 r197d9d4  
    120120configuration steps:</para>
    121121
    122 <screen><userinput><command>twadmin --create-polfile --site-keyfile=/etc/tripwire site.key \
     122<screen><userinput><command>twadmin --create-polfile --site-keyfile /etc/tripwire/site.key \
    123123    /etc/tripwire/twpol.txt &amp;&amp;
    124124tripwire --init</command></userinput></screen>

  • template/template.xml

    rcaae7a2 r197d9d4  
    1818
    1919<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
     20
    2021<sect1info>
    21 <othername>$LastChangedBy$</othername>
    22 <date>$Date$</date>
     22  <othername>$LastChangedBy$</othername>
     23  <date>$Date$</date>
    2324</sect1info>
     25
    2426<?dbhtml filename="TEMPLATE.html"?>
    2527<title><application>TEMPLATE</application>-&TEMPLATE-version;</title>
    2628<indexterm zone="TEMPLATE">
    27 <primary sortas="a-TEMPLATE">TEMPLATE</primary></indexterm>
     29  <primary sortas="a-TEMPLATE">TEMPLATE</primary>
     30</indexterm>
    2831
    2932<sect2>
    … …  
    3538<sect3><title>Package information</title>
    3639<itemizedlist spacing="compact">
    37 <listitem><para>Download (HTTP):
    38 <ulink url="&TEMPLATE-download-http;"/></para></listitem>
    39 <listitem><para>Download (FTP):
    40 <ulink url="&TEMPLATE-download-ftp;"/></para></listitem>
    41 <listitem><para>Download MD5 sum:
    42 &TEMPLATE-md5sum;</para></listitem>
    43 <listitem><para>Download size:
    44 &TEMPLATE-size;</para></listitem>
    45 <listitem><para>Estimated disk space required:
    46 &TEMPLATE-buildsize;</para></listitem>
    47 <listitem><para>Estimated build time:
    48 &TEMPLATE-time;</para></listitem></itemizedlist>
    49 </sect3>
    50 
    51 <sect3><title>Additional downloads</title>
    52 <itemizedlist spacing="compact">
    53 <listitem><para>Required patch: <ulink
    54 url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para>
    55 </listitem></itemizedlist>
     40  <listitem><para>Download (HTTP):
     41    <ulink url="&TEMPLATE-download-http;"/></para></listitem>
     42  <listitem><para>Download (FTP):
     43    <ulink url="&TEMPLATE-download-ftp;"/></para></listitem>
     44  <listitem><para>Download MD5 sum:
     45    &TEMPLATE-md5sum;</para></listitem>
     46  <listitem><para>Download size:
     47    &TEMPLATE-size;</para></listitem>
     48  <listitem><para>Estimated disk space required:
     49    &TEMPLATE-buildsize;</para></listitem>
     50  <listitem><para>Estimated build time:
     51    &TEMPLATE-time;</para></listitem></itemizedlist>
     52</sect3>
     53
     54<sect3>
     55  <title>Additional downloads</title>
     56  <itemizedlist spacing="compact">
     57    <listitem><para>Required patch: <ulink
     58      url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/></para>
     59    </listitem>
     60  </itemizedlist>
    5661</sect3>
    5762
    5863<sect3><title><application>TEMPLATE</application> dependencies</title>
    59 <sect4><title>Required</title>
    60 <para><xref linkend="BLFS DEPENDENCY"/></para>
    61 </sect4>
    62 
    63 <sect4><title>Optional</title>
    64 <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
    65 </sect4>
     64  <sect4><title>Required</title>
     65    <para><xref linkend="BLFS DEPENDENCY"/></para>
     66  </sect4>
     67
     68  <sect4><title>Optional</title>
     69    <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
     70  </sect4>
    6671</sect3>
    6772
    … …  
    99104<title>Configuring <application>TEMPLATE</application></title>
    100105
    101 <sect3 id="TEMPLATE-config"><title>Config files</title>
    102 <para><filename>~/.Configfilename1</filename> and
    103 <filename>/etc/path/Configfilename2</filename></para>
    104 
    105 <indexterm zone="TEMPLATE TEMPLATE-config">
    106 <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
    107 </indexterm>
    108 <indexterm zone="TEMPLATE TEMPLATE-config">
    109 <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
    110 </indexterm>
     106<sect3 id="TEMPLATE-config">
     107  <title>Config files</title>
     108  <para><filename>~/.Configfilename1</filename> and
     109    <filename>/etc/path/Configfilename2</filename></para>
     110
     111  <indexterm zone="TEMPLATE TEMPLATE-config">
     112    <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
     113  </indexterm>
     114 
     115  <indexterm zone="TEMPLATE TEMPLATE-config">
     116    <primary sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
     117  </indexterm>
    111118</sect3>
    112119
    113120<sect3><title>Configuration information</title>
    114121
    115 <para><userinput role='root'>USERINPUT GOES HERE</userinput> Blah blah blah
    116 about config.</para>
    117 
    118 <para id="TEMPLATE-init">To automatically start the
    119 <command>TEMPLATE</command> daemon when the system is rebooted, install the
    120 <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
    121 <xref linkend="intro-important-bootscripts"/> package.</para>
    122 <indexterm zone="TEMPLATE TEMPLATE-init">
    123 <primary sortas="f-TEMPLATE">TEMPLATE</primary></indexterm>
     122  <para><userinput role='root'>USERINPUT GOES HERE</userinput> Blah blah blah
     123    about config.</para>
     124
     125  <para id="TEMPLATE-init">To automatically start the
     126    <command>TEMPLATE</command> daemon when the system is rebooted, install the
     127    <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
     128    <xref linkend="intro-important-bootscripts"/> package.</para>
     129
     130  <indexterm zone="TEMPLATE TEMPLATE-init">
     131    <primary sortas="f-TEMPLATE">TEMPLATE</primary>
     132  </indexterm>
    124133
    125134<screen><userinput role='root'><command>make install-TEMPLATE</command></userinput></screen>
    … …  
    132141
    133142<segmentedlist>
    134 <segtitle>Installed Program(s)</segtitle>
    135 <segtitle>Installed Librar(y,ies)</segtitle>
    136 <segtitle>Installed Director(y,ies)</segtitle>
    137 <seglistitem>
    138 <seg>PROGRAM1, PROGRAM2 and PROGRAM3</seg>
    139 <seg>libLIBRARY1, libLIBRARY2 and libLIBRARY3</seg>
    140 <seg>/etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
    141 /usr/share/TEMPLATE-&TEMPLATE-version;,
    142 /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
    143 /var/lib/TEMPLATE</seg>
    144 </seglistitem>
     143  <segtitle>Installed Program(s)</segtitle>
     144  <segtitle>Installed Librar(y,ies)</segtitle>
     145  <segtitle>Installed Director(y,ies)</segtitle>
     146
     147  <seglistitem>
     148    <seg>PROGRAM1, PROGRAM2 and PROGRAM3</seg>
     149    <seg>libLIBRARY1, libLIBRARY2 and libLIBRARY3</seg>
     150    <seg>/etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
     151         /usr/share/TEMPLATE-&TEMPLATE-version;,
     152         /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
     153         /var/lib/TEMPLATE</seg>
     154  </seglistitem>
    145155</segmentedlist>
    146156
    147157<variablelist>
    148 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    149 <?dbfo list-presentation="list"?>
     158  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     159  <?dbfo list-presentation="list"?>
    150160
    151161<!-- If the program or library name conflicts (is the same) as the
    … …  
    154164
    155165<varlistentry id="PROGRAM1">
    156 <term><command>PROGRAM1</command></term>
    157 <listitem><para>does this .....</para>
    158 <indexterm zone="TEMPLATE PROGRAM1">
    159 <primary sortas="b-PROGRAM1">PROGRAM1</primary></indexterm>
    160 </listitem>
     166  <term><command>PROGRAM1</command></term>
     167  <listitem>
     168    <para>does this .....</para>
     169    <indexterm zone="TEMPLATE PROGRAM1">
     170      <primary sortas="b-PROGRAM1">PROGRAM1</primary>
     171    </indexterm>
     172  </listitem>
    161173</varlistentry>
    162174
    163175<varlistentry id="PROGRAM2">
    164 <term><command>PROGRAM2</command></term>
    165 <listitem><para>does this .....</para>
    166 <indexterm zone="TEMPLATE PROGRAM2">
    167 <primary sortas="b-PROGRAM2">PROGRAM2</primary></indexterm>
    168 </listitem>
     176  <term><command>PROGRAM2</command></term>
     177  <listitem>
     178    <para>does this .....</para>
     179    <indexterm zone="TEMPLATE PROGRAM2">
     180      <primary sortas="b-PROGRAM2">PROGRAM2</primary>
     181    </indexterm>
     182  </listitem>
    169183</varlistentry>
    170184
    171185<varlistentry id="libLIBRARY1">
    172 <term><filename class='libraryfile'>libLIBRARY1.[so,a]</filename></term>
    173 <listitem><para>contains functions that .....</para>
    174 <indexterm zone="TEMPLATE libLIBRARY1">
    175 <primary sortas="c-libLIBRARY1">libLIBRARY1.[so,a]</primary></indexterm>
    176 </listitem>
     186  <term><filename class='libraryfile'>libLIBRARY1.[so,a]</filename></term>
     187  <listitem>
     188    <para>contains functions that .....</para>
     189    <indexterm zone="TEMPLATE libLIBRARY1">
     190      <primary sortas="c-libLIBRARY1">libLIBRARY1.[so,a]</primary>
     191    </indexterm>
     192  </listitem>
    177193</varlistentry>
     194
    178195</variablelist>
    179196

  • x/installing/xorg.xml

    rcaae7a2 r197d9d4  
    55  %general-entities;
    66
    7   <!ENTITY xorg-download-http "http://freedesktop.org/~xorg/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
    8   <!ENTITY xorg-download-ftp  " ">
     7  <!ENTITY xorg-download-http "">
     8  <!ENTITY xorg-download-ftp  "ftp://ftp.opengroup.org/pub/x.org/pub/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
    99  <!ENTITY xorg-size          "41 MB">
    1010  <!ENTITY xorg-buildsize     "645 MB">
    … …  
    8787<para>As an alternative to downloading the entire source tree in a single
    8888file, there are several files that need to be fetched from the download
    89 location:</para>
     89location (directory /pub/x.org/pub/X11R&xorg-version;/src/):</para>
    9090
    9191<itemizedlist spacing='compact'>
Note: See TracChangeset for help on using the changeset viewer.