Automatic merge of trunk into multilib

This commit is contained in:
Thomas Trepl 2022-12-12 00:30:12 +01:00
commit 28a0e48811
4 changed files with 28 additions and 27 deletions

View File

@ -222,7 +222,7 @@
<varlistentry id="groff"> <varlistentry id="groff">
<term><command>groff</command></term> <term><command>groff</command></term>
<listitem> <listitem>
<para>A front-end to the groff document formatting system; normally, it <para>A front end to the groff document formatting system; normally, it
runs the <command>troff</command> program and a post-processor runs the <command>troff</command> program and a post-processor
appropriate for the selected device</para> appropriate for the selected device</para>
<indexterm zone="ch-system-groff groff"> <indexterm zone="ch-system-groff groff">

View File

@ -209,8 +209,8 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
<varlistentry id="grub-macbless"> <varlistentry id="grub-macbless">
<term><command>grub-macbless</command></term> <term><command>grub-macbless</command></term>
<listitem> <listitem>
<para>Is the Mac-style bless for HFS or HFS+ files (<command>bless</command> <para>Is the Mac-style bless for HFS or HFS+ file systems (<command>bless</command>
is peculiar to Apple machiines; it makes a device bootable)</para> is peculiar to Apple machines; it makes a device bootable)</para>
<indexterm zone="ch-system-grub grub-macbless"> <indexterm zone="ch-system-grub grub-macbless">
<primary sortas="b-grub-macbless">grub-macbless</primary> <primary sortas="b-grub-macbless">grub-macbless</primary>
</indexterm> </indexterm>

View File

@ -42,12 +42,12 @@
<title>Installation of IPRoute2</title> <title>Installation of IPRoute2</title>
<para>The <command>arpd</command> program included in this package will not <para>The <command>arpd</command> program included in this package will not
be built since it is dependent on Berkeley DB, which is not installed in be built since it depends on Berkeley DB, which is not installed in
LFS. However, a directory for <command>arpd</command> and a man page will still LFS. However, a directory and a man page for <command>arpd</command> will still
be installed. Prevent this by running the commands below. be installed. Prevent this by running the commands shown below.
If the <command>arpd</command> binary is needed, (If the <command>arpd</command> program is needed,
instructions for compiling Berkeley DB can be found in the BLFS Book at instructions for compiling Berkeley DB can be found in the BLFS book at
<ulink url="&blfs-book;server/db.html"/>. <ulink url="&blfs-book;server/db.html"/>.)
</para> </para>
<screen><userinput remap="pre">sed -i /ARPD/d Makefile <screen><userinput remap="pre">sed -i /ARPD/d Makefile
@ -140,9 +140,9 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<term><command>ifcfg</command></term> <term><command>ifcfg</command></term>
<listitem> <listitem>
<para>A shell script wrapper for the <command>ip</command> command <para>A shell script wrapper for the <command>ip</command> command
[Note that it requires the <command>arping</command> and (Note that this script requires the <command>arping</command> and
<command>rdisk</command> programs from the <command>rdisk</command> programs from the
iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.]</para> iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.)</para>
<indexterm zone="ch-system-iproute2 ifcfg"> <indexterm zone="ch-system-iproute2 ifcfg">
<primary sortas="b-ifcfg">ifcfg</primary> <primary sortas="b-ifcfg">ifcfg</primary>
</indexterm> </indexterm>
@ -152,8 +152,8 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="ifstat"> <varlistentry id="ifstat">
<term><command>ifstat</command></term> <term><command>ifstat</command></term>
<listitem> <listitem>
<para>Shows the interface statistics, including the amount of <para>Shows interface statistics, including the number of
transmitted and received packets by interface</para> packets transmitted and received, by interface</para>
<indexterm zone="ch-system-iproute2 ifstat"> <indexterm zone="ch-system-iproute2 ifstat">
<primary sortas="b-ifstat">ifstat</primary> <primary sortas="b-ifstat">ifstat</primary>
</indexterm> </indexterm>
@ -163,7 +163,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="ip"> <varlistentry id="ip">
<term><command>ip</command></term> <term><command>ip</command></term>
<listitem> <listitem>
<para>The main executable. It has several different functions:</para> <para>The main executable. It has several different functions, including these:</para>
<para><command>ip link <replaceable>&lt;device&gt;</replaceable></command> <para><command>ip link <replaceable>&lt;device&gt;</replaceable></command>
allows users to look at the state of devices and to make changes</para> allows users to look at the state of devices and to make changes</para>
@ -213,7 +213,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="nstat"> <varlistentry id="nstat">
<term><command>nstat</command></term> <term><command>nstat</command></term>
<listitem> <listitem>
<para>Shows network statistics</para> <para>Displays network statistics</para>
<indexterm zone="ch-system-iproute2 nstat"> <indexterm zone="ch-system-iproute2 nstat">
<primary sortas="b-nstat">nstat</primary> <primary sortas="b-nstat">nstat</primary>
</indexterm> </indexterm>
@ -223,7 +223,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="routef"> <varlistentry id="routef">
<term><command>routef</command></term> <term><command>routef</command></term>
<listitem> <listitem>
<para>A component of <command>ip route</command>. This is for flushing <para>A component of <command>ip route</command>, for flushing
the routing tables</para> the routing tables</para>
<indexterm zone="ch-system-iproute2 routef"> <indexterm zone="ch-system-iproute2 routef">
<primary sortas="b-routef">routef</primary> <primary sortas="b-routef">routef</primary>
@ -234,7 +234,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="routel"> <varlistentry id="routel">
<term><command>routel</command></term> <term><command>routel</command></term>
<listitem> <listitem>
<para>A component of <command>ip route</command>. This is for listing <para>A component of <command>ip route</command>, for listing
the routing tables</para> the routing tables</para>
<indexterm zone="ch-system-iproute2 routel"> <indexterm zone="ch-system-iproute2 routel">
<primary sortas="b-routel">routel</primary> <primary sortas="b-routel">routel</primary>
@ -266,7 +266,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
<varlistentry id="rtpr"> <varlistentry id="rtpr">
<term><command>rtpr</command></term> <term><command>rtpr</command></term>
<listitem> <listitem>
<para>Converts the output of <command>ip -o</command> back into a <para>Converts the output of <command>ip -o</command> into a
readable form</para> readable form</para>
<indexterm zone="ch-system-iproute2 rtpr"> <indexterm zone="ch-system-iproute2 rtpr">
<primary sortas="b-rtpr">rtpr</primary> <primary sortas="b-rtpr">rtpr</primary>
@ -295,11 +295,12 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
</listitem> </listitem>
</varlistentry> </varlistentry>
<!-- FixMe These options don't match tc -help screen -->
<varlistentry id="tc"> <varlistentry id="tc">
<term><command>tc</command></term> <term><command>tc</command></term>
<listitem> <listitem>
<para>Traffic Controlling Executable; this is for Quality Of Service <para>Traffic control for Quality of Service
(QOS) and Class Of Service (COS) implementations</para> (QoS) and Class of Service (CoS) implementations</para>
<para><command>tc qdisc</command> allows users to set up the queueing <para><command>tc qdisc</command> allows users to set up the queueing
discipline</para> discipline</para>
@ -308,12 +309,12 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
on the queuing discipline scheduling</para> on the queuing discipline scheduling</para>
<para><command>tc estimator</command> allows users to estimate the <para><command>tc estimator</command> allows users to estimate the
network flow into a network</para> data flow through a network</para>
<para><command>tc filter</command> allows users to setup the QOS/COS <para><command>tc filter</command> allows users to set up the QoS/CoS
packet filtering</para> packet filtering</para>
<para><command>tc policy</command> allows users to setup the QOS/COS <para><command>tc policy</command> allows users to set up the QoS/CoS
policies</para> policies</para>
<indexterm zone="ch-system-iproute2 ss"> <indexterm zone="ch-system-iproute2 ss">
<primary sortas="b-tc">tc</primary> <primary sortas="b-tc">tc</primary>

View File

@ -89,7 +89,7 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
<command>m4</command> has built-in functions for including named <command>m4</command> has built-in functions for including named
files, running Unix commands, performing integer arithmetic, files, running Unix commands, performing integer arithmetic,
manipulating text, recursion, etc. The <command>m4</command> program manipulating text, recursion, etc. The <command>m4</command> program
can be used either as a front-end to a compiler or as a macro processor can be used either as a front end to a compiler or as a macro processor
in its own right</para> in its own right</para>
<indexterm zone="ch-system-m4 m4"> <indexterm zone="ch-system-m4 m4">
<primary sortas="b-m4">m4</primary> <primary sortas="b-m4">m4</primary>