Changeset a09fa5f


Ignore:
Timestamp:
12/12/2022 12:29:04 PM (17 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
9813d3d9
Parents:
f16e611 (diff), c1a6bf9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Location:
chapter08
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • chapter08/coreutils.xml

    rf16e611 ra09fa5f  
    369369        <term><command>date</command></term>
    370370        <listitem>
    371           <para>Displays the current dae and time in the given format, or sets the
     371          <para>Displays the current date and time in the given format, or sets the
    372372          system date and time</para>
    373373          <indexterm zone="ch-system-coreutils date">

  • chapter08/diffutils.xml

    rf16e611 ra09fa5f  
    8080        <term><command>cmp</command></term>
    8181        <listitem>
    82           <para>Compares two files and reports whether or in which bytes they
    83           differ</para>
     82          <para>Compares two files and reports any differences byte by byte</para>
    8483          <indexterm zone="ch-system-diffutils cmp">
    8584            <primary sortas="b-cmp">cmp</primary>

  • chapter08/findutils.xml

    rf16e611 ra09fa5f  
    2424    <title/>
    2525
    26     <para>The Findutils package contains programs to find files. These programs
    27     are provided to recursively search through a directory tree and to
     26    <para>The Findutils package contains programs to find files. Programs
     27    are provided to search through all the files in a directory tree and to
    2828    create, maintain, and search a database (often faster than the recursive
    29     find, but is unreliable if the database has not been recently updated).</para>
     29    find, but unreliable unless the database has been updated recently).
     30    Findutils also supplies the <command>xargs</command> program, which
     31    can be used to run a specified command on each file selected by a search.</para>
    3032
    3133    <segmentedlist>
    … …  
    6466        <term><parameter>--localstatedir</parameter></term>
    6567        <listitem>
    66           <para>This option changes the location of the <command>locate</command>
    67           database to be in <filename class="directory">/var/lib/locate</filename>,
    68           which is FHS-compliant.</para>
     68          <para>This option moves the <command>locate</command>
     69          database to <filename class="directory">/var/lib/locate</filename>,
     70          which is the FHS-compliant location.</para>
    6971        </listitem>
    7072      </varlistentry>

  • chapter08/groff.xml

    rf16e611 ra09fa5f  
    2525
    2626    <para>The Groff package contains programs for processing and formatting
    27     text.</para>
     27    text and images.</para>
    2828
    2929    <segmentedlist>
    … …  
    169169        <term><command>gperl</command></term>
    170170        <listitem>
    171           <para>Preprocesor for groff, allowing addition of perl code
     171          <para>Preprocesor for groff, allowing the insertion of perl code
    172172          into groff files</para>
    173173          <indexterm zone="ch-system-groff gperl">
    … …  
    180180        <term><command>gpinyin</command></term>
    181181        <listitem>
    182           <para>Preprocesor for groff, allowing addition of Chinese
    183           European-like language Pinyin into groff files.</para>
     182          <para>Preprocesor for groff, allowing the insertion of Pinyin
     183          (Mandarin Chinese spelled with the Roman alphabet) into groff files.</para>
    184184          <indexterm zone="ch-system-groff gpinyin">
    185185            <primary sortas="b-gpinyin">gpinyin</primary>
    … …  
    191191        <term><command>grap2graph</command></term>
    192192        <listitem>
    193           <para>Converts a grap diagram into a cropped bitmap image</para>
     193          <para>Converts a grap program file into a cropped bitmap image
     194          (grap is an old Unix programming language for creating diagrams)</para>
    194195          <indexterm zone="ch-system-groff grap2graph">
    195196            <primary sortas="b-grap2graph">grap2graph</primary>
    … …  
    212213        <listitem>
    213214          <para>A driver for <command>groff</command> that produces TeX dvi
    214           format</para>
     215          format output files</para>
    215216          <indexterm zone="ch-system-groff grodvi">
    216217            <primary sortas="b-grodvi">grodvi</primary>
    … …  
    222223        <term><command>groff</command></term>
    223224        <listitem>
    224           <para>A front-end to the groff document formatting system; normally, it
     225          <para>A front end to the groff document formatting system; normally, it
    225226          runs the <command>troff</command> program and a post-processor
    226227          appropriate for the selected device</para>

  • chapter08/grub.xml

    rf16e611 ra09fa5f  
    4545        If your system has UEFI support and you wish to boot LFS with UEFI,
    4646        you can skip this package in LFS,
    47         and install GRUB with UEFI support (and its dependencies) following
    48         <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
    49         at the end of this chapter.
     47        and install GRUB with UEFI support (and its dependencies) by following
     48        the instructions on
     49        <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>.
    5050      </para>
    5151    </note>
    … …  
    5757
    5858      <para>Don't try <quote>tuning</quote> this package with custom
    59       compilation flags: this package is a bootloader, with low-level
    60       operations in the source code which is likely to be broken by some
    61       aggressive optimizations.</para>
     59      compilation flags. This package is a bootloader. The low-level
     60      operations in the source code may be broken by
     61      aggressive optimization.</para>
    6262    </warning>
    6363
    … …  
    7676        <listitem>
    7777          <para>This allows the build to complete with warnings introduced
    78           by more recent Flex versions.</para>
     78          by more recent versions of Flex.</para>
    7979        </listitem>
    8080      </varlistentry>
    … …  
    8484        <listitem>
    8585          <para>This option minimizes what is built by disabling a feature and
    86           testing programs not needed for LFS.</para>
     86          eliminating some test programs not needed for LFS.</para>
    8787        </listitem>
    8888      </varlistentry>
    … …  
    103103mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userinput></screen>
    104104
    105   <para>Using GRUB to make your LFS system bootable will be discussed in
     105  <para>Making your LFS system bootable with GRUB will be discussed in
    106106  <xref linkend="ch-bootable-grub"/>.</para>
    107107
    … …  
    139139        <term><command>grub-bios-setup</command></term>
    140140        <listitem>
    141           <para>Is a helper program for grub-install</para>
     141          <para>Is a helper program for <command>grub-install</command></para>
    142142          <indexterm zone="ch-system-grub grub-bios-setup">
    143143            <primary sortas="b-grub-bios-setup">grub-bios-setup</primary>
    … …  
    149149        <term><command>grub-editenv</command></term>
    150150        <listitem>
    151           <para>A tool to edit the environment block</para>
     151          <para>Is a tool to edit the environment block</para>
    152152          <indexterm zone="ch-system-grub grub-editenv">
    153153            <primary sortas="b-grub-editenv">grub-editenv</primary>
    … …  
    159159        <term><command>grub-file</command></term>
    160160        <listitem>
    161           <para>Checks if FILE is of the specified type.</para>
     161          <para>Checks to see if the given file is of the specified type</para>
    162162          <indexterm zone="ch-system-grub grub-file">
    163163            <primary sortas="b-grub-file">grub-file</primary>
    … …  
    169169        <term><command>grub-fstest</command></term>
    170170        <listitem>
    171           <para>Tool to debug the filesystem driver</para>
     171          <para>Is a tool to debug the filesystem driver</para>
    172172          <indexterm zone="ch-system-grub grub-fstest">
    173173            <primary sortas="b-grub-fstest">grub-fstest</primary>
    … …  
    179179        <term><command>grub-glue-efi</command></term>
    180180        <listitem>
    181           <para>Glue 32-bit and 64-bit binary into Apple universal one.</para>
     181          <para>Glues 32-bit and 64-bit binaries into a single file (for Apple machines)</para>
    182182          <indexterm zone="ch-system-grub grub-glue-efi">
    183183            <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
    … …  
    189189        <term><command>grub-install</command></term>
    190190        <listitem>
    191           <para>Install GRUB on your drive</para>
     191          <para>Installs GRUB on your drive</para>
    192192          <indexterm zone="ch-system-grub grub-install">
    193193            <primary sortas="b-grub-install">grub-install</primary>
    … …  
    199199        <term><command>grub-kbdcomp</command></term>
    200200        <listitem>
    201           <para>Script that converts an xkb layout into one recognized by
     201          <para>Is a script that converts an xkb layout into one recognized by
    202202          GRUB</para>
    203203          <indexterm zone="ch-system-grub grub-kbdcomp">
    … …  
    210210        <term><command>grub-macbless</command></term>
    211211        <listitem>
    212           <para>Mac-style bless on HFS or HFS+ files</para>
     212          <para>Is the Mac-style bless for HFS or HFS+ file systems (<command>bless</command>
     213          is peculiar to Apple machines; it makes a device bootable)</para>
    213214          <indexterm zone="ch-system-grub grub-macbless">
    214215            <primary sortas="b-grub-macbless">grub-macbless</primary>
    … …  
    231232        <term><command>grub-mkconfig</command></term>
    232233        <listitem>
    233           <para>Generate a grub config file</para>
     234          <para>Generates a <filename>grub.cfg</filename> file</para>
    234235          <indexterm zone="ch-system-grub grub-mkconfig">
    235236            <primary sortas="b-grub-mkconfig">grub-mkconfig</primary>
    … …  
    241242        <term><command>grub-mkimage</command></term>
    242243        <listitem>
    243           <para>Make a bootable image of GRUB</para>
     244          <para>Makes a bootable image of GRUB</para>
    244245          <indexterm zone="ch-system-grub grub-mkimage">
    245246            <primary sortas="b-grub-mkimage">grub-mkimage</primary>
    … …  
    292293        <term><command>grub-mkrescue</command></term>
    293294        <listitem>
    294           <para>Make a bootable image of GRUB suitable for a floppy disk or CDROM/DVD</para>
     295          <para>Makes a bootable image of GRUB suitable for a floppy disk,
     296          CDROM/DVD, or a USB drive</para>
    295297          <indexterm zone="ch-system-grub grub-mkrescue">
    296298            <primary sortas="b-grub-mkrescue">grub-mkrescue</primary>
    … …  
    312314        <term><command>grub-ofpathname</command></term>
    313315        <listitem>
    314           <para>Is a helper program that prints the path of a GRUB device</para>
     316          <para>Is a helper program that prints the path to a GRUB device</para>
    315317          <indexterm zone="ch-system-grub grub-ofpathname">
    316318            <primary sortas="b-grub-ofpathname">grub-ofpathname</primary>
    … …  
    322324        <term><command>grub-probe</command></term>
    323325        <listitem>
    324           <para>Probe device information for a given path or device</para>
     326          <para>Probes device information for a given path or device</para>
    325327          <indexterm zone="ch-system-grub grub-probe">
    326328            <primary sortas="b-grub-probe">grub-probe</primary>
    … …  
    342344        <term><command>grub-render-label</command></term>
    343345        <listitem>
    344           <para>Render Apple .disk_label for Apple Macs</para>
     346          <para>Renders Apple .disk_label for Apple Macs</para>
    345347          <indexterm zone="ch-system-grub grub-render-label">
    346348            <primary sortas="b-grub-render-label">grub-render-label</primary>
    … …  
    352354        <term><command>grub-script-check</command></term>
    353355        <listitem>
    354           <para>Checks GRUB configuration script for syntax errors</para>
     356          <para>Checks the GRUB configuration script for syntax errors</para>
    355357          <indexterm zone="ch-system-grub grub-script-check">
    356358            <primary sortas="b-grub-script-check">grub-script-check</primary>
    … …  
    382384        <term><command>grub-syslinux2cfg</command></term>
    383385        <listitem>
    384           <para>Transform a syslinux config file into grub.cfg format</para>
     386          <para>Transforms a syslinux config file into grub.cfg format</para>
    385387          <indexterm zone="ch-system-grub grub-syslinux2cfg">
    386388            <primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>

  • chapter08/iproute2.xml

    rf16e611 ra09fa5f  
    4343
    4444    <para>The <command>arpd</command> program included in this package will not
    45     be built since it is dependent on Berkeley DB, which is not installed in
    46     LFS. However, a directory for <command>arpd</command> and a man page will still
    47     be installed. Prevent this by running the commands below.
    48     If the <command>arpd</command> binary is needed,
    49     instructions for compiling Berkeley DB can be found in the BLFS Book at
    50     <ulink url="&blfs-book;server/db.html"/>.
     45    be built since it depends on Berkeley DB, which is not installed in
     46    LFS. However, a directory and a man page for <command>arpd</command> will still
     47    be installed. Prevent this by running the commands shown below.
     48    (If the <command>arpd</command> program is needed,
     49    instructions for compiling Berkeley DB can be found in the BLFS book at
     50    <ulink url="&blfs-book;server/db.html"/>.)
    5151    </para>
    5252
    … …  
    9494
    9595      <seglistitem>
    96         <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
    97         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
     96        <seg>bridge, ctstat (link to lnstat), genl, ifstat, ip, lnstat,
     97        nstat, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
    9898        and tc</seg>
    9999        <seg>/etc/iproute2, /usr/lib/tc, and /usr/share/doc/iproute2-&iproute2-version;
    … …  
    130130        <term><command>genl</command></term>
    131131        <listitem>
    132           <para>Generic netlink utility frontend</para>
     132          <para>Generic netlink utility front end</para>
    133133          <indexterm zone="ch-system-iproute2 genl">
    134134            <primary sortas="b-genl">genl</primary>
    … …  
    137137      </varlistentry>
    138138
    139       <varlistentry id="ifcfg">
    140         <term><command>ifcfg</command></term>
    141         <listitem>
    142           <para>A shell script wrapper for the <command>ip</command> command
    143           [Note that it requires the <command>arping</command> and
    144           <command>rdisk</command> programs from the
    145           iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.]</para>
    146           <indexterm zone="ch-system-iproute2 ifcfg">
    147             <primary sortas="b-ifcfg">ifcfg</primary>
    148           </indexterm>
    149         </listitem>
    150       </varlistentry>
    151 
    152139      <varlistentry id="ifstat">
    153140        <term><command>ifstat</command></term>
    154141        <listitem>
    155           <para>Shows the interface statistics, including the amount of
    156           transmitted and received packets by interface</para>
     142          <para>Shows interface statistics, including the number of
     143          packets transmitted and received, by interface</para>
    157144          <indexterm zone="ch-system-iproute2 ifstat">
    158145            <primary sortas="b-ifstat">ifstat</primary>
    … …  
    164151        <term><command>ip</command></term>
    165152        <listitem>
    166           <para>The main executable. It has several different functions:</para>
     153          <para>The main executable. It has several different functions, including these:</para>
    167154
    168155          <para><command>ip link <replaceable>&lt;device&gt;</replaceable></command>
    … …  
    214201        <term><command>nstat</command></term>
    215202        <listitem>
    216           <para>Shows network statistics</para>
     203          <para>Displays network statistics</para>
    217204          <indexterm zone="ch-system-iproute2 nstat">
    218205            <primary sortas="b-nstat">nstat</primary>
    … …  
    221208      </varlistentry>
    222209
    223       <varlistentry id="routef">
    224         <term><command>routef</command></term>
    225         <listitem>
    226           <para>A component of <command>ip route</command>. This is for flushing
    227           the routing tables</para>
    228           <indexterm zone="ch-system-iproute2 routef">
    229             <primary sortas="b-routef">routef</primary>
    230           </indexterm>
    231         </listitem>
    232       </varlistentry>
    233 
    234210      <varlistentry id="routel">
    235211        <term><command>routel</command></term>
    236212        <listitem>
    237           <para>A component of <command>ip route</command>. This is for listing
     213          <para>A component of <command>ip route</command>, for listing
    238214          the routing tables</para>
    239215          <indexterm zone="ch-system-iproute2 routel">
    … …  
    267243        <term><command>rtpr</command></term>
    268244        <listitem>
    269           <para>Converts the output of <command>ip -o</command> back into a
     245          <para>Converts the output of <command>ip -o</command> into a
    270246          readable form</para>
    271247          <indexterm zone="ch-system-iproute2 rtpr">
    … …  
    296272      </varlistentry>
    297273
     274      <!-- FixMe These options don't match tc -help screen -->
    298275      <varlistentry id="tc">
    299276        <term><command>tc</command></term>
    300277        <listitem>
    301           <para>Traffic Controlling Executable; this is for Quality Of Service
    302           (QOS) and Class Of Service (COS) implementations</para>
    303 
    304           <para><command>tc qdisc</command> allows users to setup the queueing
     278          <para>Traffic control for Quality of Service
     279          (QoS) and Class of Service (CoS) implementations</para>
     280
     281          <para><command>tc qdisc</command> allows users to set up the queueing
    305282          discipline</para>
    306283
    307           <para><command>tc class</command> allows users to setup classes based
     284          <para><command>tc class</command> allows users to set up classes based
    308285          on the queuing discipline scheduling</para>
    309286
    310287          <para><command>tc estimator</command> allows users to estimate the
    311           network flow into a network</para>
    312 
    313           <para><command>tc filter</command> allows users to setup the QOS/COS
     288          data flow through a network</para>
     289
     290          <para><command>tc filter</command> allows users to set up the QoS/CoS
    314291          packet filtering</para>
    315292
    316           <para><command>tc policy</command> allows users to setup the QOS/COS
     293          <para><command>tc policy</command> allows users to set up the QoS/CoS
    317294          policies</para>
    318295          <indexterm zone="ch-system-iproute2 ss">

  • chapter08/m4.xml

    rf16e611 ra09fa5f  
    9090          files, running Unix commands, performing integer arithmetic,
    9191          manipulating text, recursion, etc. The <command>m4</command> program
    92           can be used either as a front-end to a compiler or as a macro processor
     92          can be used either as a front end to a compiler or as a macro processor
    9393          in its own right</para>
    9494          <indexterm zone="ch-system-m4 m4">
Note: See TracChangeset for help on using the changeset viewer.