Removed excess spaces from the ends of lines in the source files

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@4502 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Randy McMurchy 2005-05-30 21:31:54 +00:00
parent 5e9a72369c
commit 893d971120
8 changed files with 126 additions and 126 deletions

View File

@ -11,9 +11,9 @@
<title>Connecting to a Network</title>
<partintro>
<para>The LFS book covers setting up networking by connecting to a LAN
<para>The LFS book covers setting up networking by connecting to a LAN
with a static IP address. There are other methods used to connect to
a LAN and other networks (such as the Internet). We cover
a LAN and other networks (such as the Internet). We cover
the most popular methods in this chapter.</para>
</partintro>

View File

@ -20,13 +20,13 @@
</indexterm>
<para>The <application>DHCP</application> package comes with
both a client (<command>dhclient</command>) and a server program for
using DHCP. If you want to install this package,
both a client (<command>dhclient</command>) and a server program for
using DHCP. If you want to install this package,
the instructions can be found at <xref linkend="dhcp"/>.
Note that if you only want to use the client, you
do <emphasis>not</emphasis> need to run the server and so do not need
Note that if you only want to use the client, you
do <emphasis>not</emphasis> need to run the server and so do not need
the startup script and links provided for the server daemon.
You only need to run the DHCP server if you're providing
You only need to run the DHCP server if you're providing
this service to a network, and it's likely that you'll know if that's the
case; if it isn't, don't run the server! Once you have installed the
package, return here for information on how to configure the client
@ -35,10 +35,10 @@
<sect2 role="configuration">
<title>Configuring DHCP Client</title>
<para id="dhclient-service">To configure <command>dhclient</command>,
<para id="dhclient-service">To configure <command>dhclient</command>,
you need to first install the network service script,
<filename>/etc/sysconfig/network-devices/services/dhclient</filename>
included in the <xref linkend="intro-important-bootscripts"/> package
included in the <xref linkend="intro-important-bootscripts"/> package
(as <systemitem class="username">root</systemitem>):</para>
<indexterm zone="dhcp-client dhclient-service">
@ -47,10 +47,10 @@
<screen role='root'><userinput>make install-service-dhclient</userinput></screen>
<para id="dhclient-config1">Next, create the
<para id="dhclient-config1">Next, create the
<filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</filename>
configuration file with the following commands as the <systemitem
class="username">root</systemitem> user. Adjust as
configuration file with the following commands as the <systemitem
class="username">root</systemitem> user. Adjust as
necessary for additional interfaces:</para>
<indexterm zone="dhcp-client dhclient-config1">
@ -65,12 +65,12 @@ DHCP_START="-q <replaceable>[add additional start parameters here]</replaceable>
DHCP_STOP="-q -r <replaceable>[add additional stop parameters here]</replaceable>"</literal>
EOF</userinput></screen>
<para>For more information on the appropriate
<para>For more information on the appropriate
<envar>DHCP_START</envar> and <envar>DHCP_STOP</envar>
values, examine the man page for <command>dhclient</command>.</para>
<para id="dhclient-config2">Finally, you should create the
<filename>/etc/dhclient.conf</filename> file using the following commands
<para id="dhclient-config2">Finally, you should create the
<filename>/etc/dhclient.conf</filename> file using the following commands
as the <systemitem class="username">root</systemitem> user:</para>
<indexterm zone="dhcp-client dhclient-config2">
@ -78,7 +78,7 @@ EOF</userinput></screen>
</indexterm>
<note>
<para>You'll need to add a second interface definition to the file if you
<para>You'll need to add a second interface definition to the file if you
have more than one interface.</para>
</note>

View File

@ -10,18 +10,18 @@
<title>DHCP Clients</title>
<para>DHCP stands for Dynamic Host Configuration Protocol. It is a protocol
used by many sites to automatically provide information such as IP addresses,
subnet masks and routing information to computers. If your network uses
DHCP, you will need a DHCP client in order to connect to it.
<para>DHCP stands for Dynamic Host Configuration Protocol. It is a protocol
used by many sites to automatically provide information such as IP addresses,
subnet masks and routing information to computers. If your network uses
DHCP, you will need a DHCP client in order to connect to it.
DHCP is also used by some cable modems.</para>
<para>BLFS currently provides installation instructions for
two DHCP clients, <command>dhclient</command> (from the
<application>dhcp</application> package) and <command>dhcpcd</command>.
BLFS presents both sets of installation instructions and
discusses how to create an appropriate service script to work with the
<command>network</command> bootscript and the DHCP
<para>BLFS currently provides installation instructions for
two DHCP clients, <command>dhclient</command> (from the
<application>dhcp</application> package) and <command>dhcpcd</command>.
BLFS presents both sets of installation instructions and
discusses how to create an appropriate service script to work with the
<command>network</command> bootscript and the DHCP
client of your choice.</para>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dhcp-client.xml"/>

View File

@ -30,7 +30,7 @@
<title>Introduction to Dhcpcd</title>
<para>The <application>dhcpcd</application> package contains the
<command>dhcpcd</command> client. This is useful for connecting your computer
<command>dhcpcd</command> client. This is useful for connecting your computer
to a network which uses DHCP to assign network addresses.</para>
<bridgehead renderas="sect3">Package Information</bridgehead>
@ -58,7 +58,7 @@
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing='compact'>
<listitem>
<para>Required Patch:
<para>Required Patch:
<ulink url="&patch-root;/dhcpcd-&dhcpcd-version;-fhs-1.patch"/></para>
</listitem>
</itemizedlist>
@ -68,7 +68,7 @@
<sect2 role="installation">
<title>Installation of Dhcpcd</title>
<para>Install <application>dhcpcd</application> by running the following
<para>Install <application>dhcpcd</application> by running the following
commands:</para>
<screen><userinput>patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch &amp;&amp;
@ -85,35 +85,35 @@ make</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para><command>patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch</command>:
<application>dhcpcd</application> unpatched puts all configuration
and temporary files in <filename class='directory'>/etc/dhcpc</filename>. This
becomes very annoying when <application>dhcpcd</application> tells you it's
running and it's not. You look in
<filename class="directory">/var/run</filename> for the
<filename>PID</filename> file, but it's not there, the
<para><command>patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch</command>:
<application>dhcpcd</application> unpatched puts all configuration
and temporary files in <filename class='directory'>/etc/dhcpc</filename>. This
becomes very annoying when <application>dhcpcd</application> tells you it's
running and it's not. You look in
<filename class="directory">/var/run</filename> for the
<filename>PID</filename> file, but it's not there, the
<filename>PID</filename> file that needs deleting is in
<filename class="directory">/etc/dhcpc</filename>. This patch brings this
program into FHS compliance, but more importantly, puts
<filename class="directory">/etc/dhcpc</filename>. This patch brings this
program into FHS compliance, but more importantly, puts
files where you expect them to be.</para>
<para><parameter>--prefix=""</parameter>: There may be a good reason for
abandoning the normal BLFS convention of using
<parameter>--prefix=/usr</parameter> here. If you are installing
DHCP, it is likely that it is
required during the boot process and
<filename class="directory">/usr</filename> may be network mounted, in which
case <command>dhcpcd</command> wouldn't be available due to being on the
network! Therefore, depending on your situation, you may want it to be
installed in <filename class="directory">/sbin</filename> or
<filename class="directory">/usr/sbin</filename>. This command installs to
<parameter>--prefix=/usr</parameter> here. If you are installing
DHCP, it is likely that it is
required during the boot process and
<filename class="directory">/usr</filename> may be network mounted, in which
case <command>dhcpcd</command> wouldn't be available due to being on the
network! Therefore, depending on your situation, you may want it to be
installed in <filename class="directory">/sbin</filename> or
<filename class="directory">/usr/sbin</filename>. This command installs to
<filename class="directory">/sbin</filename>.</para>
<para><parameter>--sysconfdir=/var/lib</parameter>: This command installs
configuration files in the <filename class="directory">/var/lib</filename>
directory.</para>
<para><parameter>--mandir=/usr/share/man</parameter>: This command installs
<para><parameter>--mandir=/usr/share/man</parameter>: This command installs
the man pages to the <filename class="directory">/usr/share/man</filename>
directory.</para>
@ -139,7 +139,7 @@ make</userinput></screen>
<para>To configure <command>dhcpcd</command>, you need to first install
the network service script,
<filename>/etc/sysconfig/network-devices/services/dhcpcd</filename>
included in the <xref linkend="intro-important-bootscripts"/> package
included in the <xref linkend="intro-important-bootscripts"/> package
(as user <systemitem class="username">root</systemitem>):</para>
<indexterm zone="dhcpcd dhcpcd-init">
@ -148,10 +148,10 @@ make</userinput></screen>
<screen role='root'><userinput>make install-service-dhcpcd</userinput></screen>
<para id="dhcpcd-config2">Finally, as the <systemitem
<para id="dhcpcd-config2">Finally, as the <systemitem
class="username">root</systemitem> user create the
<filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename>
configuration file using the following commands. Adjust appropriately
configuration file using the following commands. Adjust appropriately
for additional interfaces:</para>
<indexterm zone="dhcpcd dhcpcd-config2">
@ -165,26 +165,26 @@ SERVICE="dhcpcd"
DHCP_START="<replaceable>[insert appropriate start options here]</replaceable>"
DHCP_STOP="-k <replaceable>[insert additional stop options here]</replaceable>"
# Set PRINTIP="yes" to have the script print
# Set PRINTIP="yes" to have the script print
# the DHCP assigned IP address
PRINTIP="no"
# Set PRINTALL="yes" to print the DHCP assigned values for
# Set PRINTALL="yes" to print the DHCP assigned values for
# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
PRINTALL="no"</literal>
EOF</userinput></screen>
<para>For more information on the appropriate <envar>DHCP_START</envar> and
<envar>DHCP_STOP</envar> values, examine the man page for
<para>For more information on the appropriate <envar>DHCP_START</envar> and
<envar>DHCP_STOP</envar> values, examine the man page for
<command>dhcpcd</command>.</para>
<note>
<para id="dhcpcd-config3">The default behavior of
<command>dhcpcd</command> is to overwrite (after making backup copies)
<filename>/etc/resolv.conf</filename>, <filename>/etc/yp.conf</filename> and
<filename>/etc/ntp.conf</filename> with new files containing information from
the DHCP server. If this is undesirable, review the
<command>dhcpcd</command> man page for switches to add to the
<para id="dhcpcd-config3">The default behavior of
<command>dhcpcd</command> is to overwrite (after making backup copies)
<filename>/etc/resolv.conf</filename>, <filename>/etc/yp.conf</filename> and
<filename>/etc/ntp.conf</filename> with new files containing information from
the DHCP server. If this is undesirable, review the
<command>dhcpcd</command> man page for switches to add to the
<envar>DHCP_START</envar> value.</para>
</note>
@ -227,8 +227,8 @@ EOF</userinput></screen>
<varlistentry id="dhcpcd-prog">
<term><command>dhcpcd</command></term>
<listitem>
<para>is an implementation of the DHCP client
specified in RFC2131 and RFC1541
<para>is an implementation of the DHCP client
specified in RFC2131 and RFC1541
(depending on which options are specified).</para>
<indexterm zone="dhcpcd dhcpcd-prog">
<primary sortas="b-dhcpcd">dhcpcd</primary>

View File

@ -29,7 +29,7 @@
<sect2 role="package">
<title>Introduction to PPP</title>
<para>The <application>PPP</application> package contains the
<para>The <application>PPP</application> package contains the
<command>pppd</command> daemon and the <command>chat</command>
program. This is used for connecting to other machines; often for connecting to
the Internet via a dial-up or PPPoE connection to an ISP.</para>
@ -67,7 +67,7 @@
<title>Installation of PPP</title>
<note id="ppp-kernel">
<para><application>PPP</application> support must be
<para><application>PPP</application> support must be
compiled into the kernel or available as a kernel module.</para>
</note>
@ -75,7 +75,7 @@
<primary sortas="d-PPP-support">PPP support</primary>
</indexterm>
<para>Install <application>PPP</application> by running the
<para>Install <application>PPP</application> by running the
following commands:</para>
<screen><userinput>./configure --prefix=/usr &amp;&amp;
@ -93,7 +93,7 @@ make install-etcppp</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para><command>make install-etcppp</command>: This command puts example
<para><command>make install-etcppp</command>: This command puts example
configuration files in <filename class="directory">/etc/ppp</filename>.</para>
</sect2>
@ -115,9 +115,9 @@ make install-etcppp</userinput></screen>
<sect3>
<title>Configuration Information</title>
<para>The <application>PPP</application> daemon requires very little
configuration. The main trick is scripting the connection. This can be done
either using the <command>chat</command> program which comes with
<para>The <application>PPP</application> daemon requires very little
configuration. The main trick is scripting the connection. This can be done
either using the <command>chat</command> program which comes with
this package or by using <xref linkend="wvdial"/>.</para>
</sect3>
@ -134,7 +134,7 @@ make install-etcppp</userinput></screen>
<seglistitem>
<seg>chat, pppd, pppdump, pppoe-discovery and pppstats</seg>
<seg>Several plugin modules installed in
<seg>Several plugin modules installed in
<filename class='directory'>/usr/lib/pppd/2.4.3</filename></seg>
<seg>/etc/ppp, /usr/include/pppd and /usr/lib/pppd</seg>
</seglistitem>
@ -148,9 +148,9 @@ make install-etcppp</userinput></screen>
<varlistentry id="chat">
<term><command>chat</command></term>
<listitem>
<para>defines a conversational exchange between the computer and the
modem. Its primary purpose is to establish the connection between the
Point-to-Point Protocol Daemon (PPPD) and the remote's
<para>defines a conversational exchange between the computer and the
modem. Its primary purpose is to establish the connection between the
Point-to-Point Protocol Daemon (PPPD) and the remote's
<command>pppd</command> process.</para>
<indexterm zone="ppp chat">
<primary sortas="b-chat">chat</primary>
@ -171,8 +171,8 @@ make install-etcppp</userinput></screen>
<varlistentry id="pppdump">
<term><command>pppdump</command></term>
<listitem>
<para>is used to convert
<application>PPP</application> record files to a readable
<para>is used to convert
<application>PPP</application> record files to a readable
format.</para>
<indexterm zone="ppp pppdump">
<primary sortas="b-pppdump">pppdump</primary>
@ -183,7 +183,7 @@ make install-etcppp</userinput></screen>
<varlistentry id="pppstats">
<term><command>pppstats</command></term>
<listitem>
<para>is used to print
<para>is used to print
<application>PPP</application> statistics.</para>
<indexterm zone="ppp pppstats">
<primary sortas="b-pppstats">pppstats</primary>

View File

@ -29,10 +29,10 @@
<sect2 role="package">
<title>Introduction to WvDial</title>
<para>The <application>WvDial</application> package contains a no-nonsense,
<para>The <application>WvDial</application> package contains a no-nonsense,
quick and easy to use alternative to <command>chat</command> and
<command>pppd</command> scripts. If you simply want to dial a modem
without the fuss and hassle of <command>chat</command> issues, then you'll
<command>pppd</command> scripts. If you simply want to dial a modem
without the fuss and hassle of <command>chat</command> issues, then you'll
want this.</para>
<bridgehead renderas="sect3">Package Information</bridgehead>
@ -67,7 +67,7 @@
<sect2 role="installation">
<title>Installation of WvDial</title>
<para>Install <application>WvDial</application> by running the following
<para>Install <application>WvDial</application> by running the following
commands:</para>
<screen><userinput>make PREFIX=/usr</userinput></screen>
@ -84,7 +84,7 @@
<sect3 id="wvdial-config">
<title>Config Files</title>
<para><filename>/etc/wvdial.conf</filename> and
<para><filename>/etc/wvdial.conf</filename> and
<filename>/etc/ppp/peers/*</filename></para>
<indexterm zone="wvdial wvdial-config">
@ -100,13 +100,13 @@
<sect3>
<title>Configuration Information</title>
<para>Perform the following two commands as the
<para>Perform the following two commands as the
<systemitem class="username">root</systemitem> user:</para>
<screen role='root'><userinput>touch /etc/wvdial.conf &amp;&amp;
wvdialconf /etc/wvdial.conf</userinput></screen>
<para><command>wvdialconf</command> will test that you have a working modem
<para><command>wvdialconf</command> will test that you have a working modem
and try to determine its exact setup. You will then need to enter your
ISP's phone number, login name and password into the
<filename>/etc/wvdial.conf</filename> file.</para>
@ -115,9 +115,9 @@ wvdialconf /etc/wvdial.conf</userinput></screen>
<screen><userinput>wvdial</userinput></screen>
<para>For more information, examine the <command>wvdialconf</command>,
<filename>wvdial.conf</filename> and <command>wvdial</command> man
pages. Also, have a look at <ulink
<para>For more information, examine the <command>wvdialconf</command>,
<filename>wvdial.conf</filename> and <command>wvdial</command> man
pages. Also, have a look at <ulink
url="http://www.electronicschat.org/nonroot-dialout/index.html">the
Non-Root Dial Out HOWTO</ulink> if you want to give non-root users
access to <command>wvdial</command>.</para>
@ -159,7 +159,7 @@ wvdialconf /etc/wvdial.conf</userinput></screen>
<varlistentry id="wvdialconf">
<term><command>wvdialconf</command></term>
<listitem>
<para>automates the configuration of
<para>automates the configuration of
<command>wvdial</command>.</para>
<indexterm zone="wvdial wvdialconf">
<primary sortas="b-wvdialconf">wvdialconf</primary>

View File

@ -12,7 +12,7 @@
<para>Other methods to connect to large networks are through ISDN
and PPPoE interfaces, among others. PPPoE is discussed here.
Pages written for ISDN (or others as the need arises) are always welcome
Pages written for ISDN (or others as the need arises) are always welcome
and will be included in future books, if available.</para>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pppoe.xml"/>

View File

@ -30,10 +30,10 @@
<title>Introduction to RP-PPPoE</title>
<para>The Roaring Penguin <application>PPPoE</application>
package contains both a client and a server component that works with the
client. The client allows you to connect to large networks that use the
PPPoE protocol, common among ADSL providers. The server component
runs alongside the client, allowing you to configure other clients that send
package contains both a client and a server component that works with the
client. The client allows you to connect to large networks that use the
PPPoE protocol, common among ADSL providers. The server component
runs alongside the client, allowing you to configure other clients that send
out a configuration request.</para>
<bridgehead renderas="sect3">Package Information</bridgehead>
@ -64,7 +64,7 @@
<para><xref linkend="ppp"/> and
<xref linkend="net-tools"/> (you may omit
<application>Net-tools</application> by using the following patch to
utilize <application>IPRoute2</application>: <ulink
utilize <application>IPRoute2</application>: <ulink
url="&patch-root;/rp-pppoe-&pppoe-version;-iproute2-1.patch"/>)</para>
</sect2>
@ -73,9 +73,9 @@
<title>Installation of RP-PPPoE</title>
<note id="pppoe-kernel">
<para>If you plan on using kernel-mode PPPoE, this package is no longer explicitly
needed, however, it is recomended for ease of configuration. Additional information
about kernel mode PPPoE can be found in
<para>If you plan on using kernel-mode PPPoE, this package is no longer explicitly
needed, however, it is recomended for ease of configuration. Additional information
about kernel mode PPPoE can be found in
<filename>rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE</filename>.</para>
</note>
@ -87,7 +87,7 @@
<screen><userinput>sed -i s%/usr/bin/logger%/bin/logger% scripts/adsl-{connect,setup,stop}.in</userinput></screen>
<para>Install <application>RP-PPPoE</application> by running the following
<para>Install <application>RP-PPPoE</application> by running the following
commands:</para>
<screen><userinput>cd src &amp;&amp;
@ -106,9 +106,9 @@ make</userinput></screen>
<title>Command Explanations</title>
<para>These are the standard installation commands that will install into
the <filename class="directory">/usr</filename> prefix. You can optionally use the
the <filename class="directory">/usr</filename> prefix. You can optionally use the
<command>go</command> script in the root of the source tree, to
run the same commands, which are then immediately followed by the
run the same commands, which are then immediately followed by the
<command>adsl-setup</command> script.</para>
</sect2>
@ -119,12 +119,12 @@ make</userinput></screen>
<sect3 id="pppoe-config">
<title>Config Files</title>
<para><filename>/etc/ppp/pppoe.conf</filename>,
<filename>/etc/ppp/firewall-standalone</filename>,
<filename>/etc/ppp/firewall-masq</filename>,
<filename>/etc/ppp/pppoe-server-options</filename>,
<filename>/etc/resolv.conf</filename>,
<filename>/etc/ppp/pap-secrets</filename>,
<para><filename>/etc/ppp/pppoe.conf</filename>,
<filename>/etc/ppp/firewall-standalone</filename>,
<filename>/etc/ppp/firewall-masq</filename>,
<filename>/etc/ppp/pppoe-server-options</filename>,
<filename>/etc/resolv.conf</filename>,
<filename>/etc/ppp/pap-secrets</filename>,
<filename>/etc/ppp/chap-secrets</filename></para>
<indexterm zone="pppoe pppoe-config">
@ -160,20 +160,20 @@ make</userinput></screen>
<sect3>
<title>Configuration Information</title>
<para>To configure <application>RP-PPPoE</application> after installation,
<para>To configure <application>RP-PPPoE</application> after installation,
you should run the <command>adsl-setup</command> script.</para>
<para>When configuring your connection, you will need to have your
ISP's nameserver information available, as well as your
username and password. You will also be asked whether to configure a
dial-on-demand or a constant connection. If your service provider does not
charge by the minute, it is usually good to have a bootscript handle the
connection for you. You can, of course, choose not to install the
following script, and start your connection manually with the
<para>When configuring your connection, you will need to have your
ISP's nameserver information available, as well as your
username and password. You will also be asked whether to configure a
dial-on-demand or a constant connection. If your service provider does not
charge by the minute, it is usually good to have a bootscript handle the
connection for you. You can, of course, choose not to install the
following script, and start your connection manually with the
<command>adsl-start</command> script.</para>
<para id="pppoe-init"><emphasis>Optionally</emphasis> install the
<filename>/etc/sysconfig/network-devices/services/pppoe</filename> service
<para id="pppoe-init"><emphasis>Optionally</emphasis> install the
<filename>/etc/sysconfig/network-devices/services/pppoe</filename> service
script included with the <xref linkend="intro-important-bootscripts"/>
package (as user <systemitem class="username">root</systemitem>).</para>
@ -183,8 +183,8 @@ make</userinput></screen>
<screen role='root'><userinput>make install-service-pppoe</userinput></screen>
<para id="pppoe-config2">Now create the config file for use with the
<filename>pppoe</filename> service script (as user <systemitem
<para id="pppoe-config2">Now create the config file for use with the
<filename>pppoe</filename> service script (as user <systemitem
class="username">root</systemitem>):</para>
<indexterm zone="pppoe pppoe-config2">
@ -193,8 +193,8 @@ make</userinput></screen>
<note>
<para>If you have previously configured the network interface that
will now use PPPoE, you should remove the interface
configuration files for that interface (as user <systemitem
will now use PPPoE, you should remove the interface
configuration files for that interface (as user <systemitem
class="username">root</systemitem>):</para>
<screen role='root'><userinput>rm -v /etc/sysconfig/network-devices/ifconfig.eth0/*</userinput></screen>
@ -222,7 +222,7 @@ EOF</userinput></screen>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe,
<seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe,
pppoe-relay, pppoe-server and pppoe-sniff</seg>
<seg>None</seg>
<seg>/etc/ppp/plugins and /usr/share/doc/rp-pppoe-&pppoe-version;</seg>
@ -237,7 +237,7 @@ EOF</userinput></screen>
<varlistentry id="adsl-connect">
<term><command>adsl-connect</command></term>
<listitem>
<para>is a shell script which manages an ADSL
<para>is a shell script which manages an ADSL
connection using the user-space PPPoE client.</para>
<indexterm zone="pppoe adsl-connect">
<primary sortas="b-adsl-connect">adsl-connect</primary>
@ -248,7 +248,7 @@ EOF</userinput></screen>
<varlistentry id="adsl-setup">
<term><command>adsl-setup</command></term>
<listitem>
<para>is a script for configuring the client. Configuration is
<para>is a script for configuring the client. Configuration is
then stored in <filename>/etc/ppp/pppoe.conf</filename>.</para>
<indexterm zone="pppoe adsl-setup">
<primary sortas="b-adsl-setup">adsl-setup</primary>
@ -259,7 +259,7 @@ EOF</userinput></screen>
<varlistentry id="adsl-start">
<term><command>adsl-start</command></term>
<listitem>
<para>starts the client using the options specified in
<para>starts the client using the options specified in
<filename>/etc/ppp/pppoe.conf</filename>.</para>
<indexterm zone="pppoe adsl-start">
<primary sortas="b-adsl-start">adsl-start</primary>
@ -270,7 +270,7 @@ EOF</userinput></screen>
<varlistentry id="adsl-status">
<term><command>adsl-status</command></term>
<listitem>
<para>displays the status of the ADSL
<para>displays the status of the ADSL
connection.</para>
<indexterm zone="pppoe adsl-status">
<primary sortas="b-adsl-status">adsl-status</primary>
@ -291,7 +291,7 @@ EOF</userinput></screen>
<varlistentry id="pppoe-prog">
<term><command>pppoe</command></term>
<listitem>
<para>is the client program. Generally it should not be started on
<para>is the client program. Generally it should not be started on
its own.</para>
<indexterm zone="pppoe pppoe-prog">
<primary sortas="b-pppoe">pppoe</primary>
@ -322,7 +322,7 @@ EOF</userinput></screen>
<varlistentry id="pppoe-sniff">
<term><command>pppoe-sniff</command></term>
<listitem>
<para>is a small network sniffer designed to assist in setting
<para>is a small network sniffer designed to assist in setting
<envar>PPPOE_EXTRA</envar> settings.</para>
<indexterm zone="pppoe pppoe-sniff">
<primary sortas="b-pppoe-sniff">pppoe-sniff</primary>