Changeset 893d9711


Ignore:
Timestamp:
05/30/2005 09:31:54 PM (19 years ago)
Author:
Randy McMurchy <randy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:
74390482
Parents:
5e9a7236
Message:

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

Location:
connect
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • connect/connect.xml

    r5e9a7236 r893d9711  
    1212
    1313  <partintro>
    14     <para>The LFS book covers setting up networking by connecting to a LAN 
     14    <para>The LFS book covers setting up networking by connecting to a LAN
    1515    with a static IP address. There are other methods used to connect to
    16     a LAN and other networks (such as the Internet).  We cover 
     16    a LAN and other networks (such as the Internet).  We cover
    1717    the most popular methods in this chapter.</para>
    1818  </partintro>

  • connect/dhcp/dhcp-client.xml

    r5e9a7236 r893d9711  
    2121
    2222  <para>The <application>DHCP</application> package comes with
    23   both a client (<command>dhclient</command>) and a server program for 
    24   using DHCP.  If you want to install this package, 
     23  both a client (<command>dhclient</command>) and a server program for
     24  using DHCP.  If you want to install this package,
    2525  the instructions can be found at <xref linkend="dhcp"/>.
    26   Note that if you only want to use the client, you 
    27   do <emphasis>not</emphasis> need to run the server and so do not need 
     26  Note that if you only want to use the client, you
     27  do <emphasis>not</emphasis> need to run the server and so do not need
    2828  the startup script and links provided for the server daemon.
    29   You only need to run the DHCP server if you're providing 
     29  You only need to run the DHCP server if you're providing
    3030  this service to a network, and it's likely that you'll know if that's the
    3131  case; if it isn't, don't run the server!  Once you have installed the
    … …  
    3636    <title>Configuring DHCP Client</title>
    3737
    38       <para id="dhclient-service">To configure <command>dhclient</command>, 
     38      <para id="dhclient-service">To configure <command>dhclient</command>,
    3939      you need to first install the network service script,
    4040      <filename>/etc/sysconfig/network-devices/services/dhclient</filename>
    41       included in the <xref linkend="intro-important-bootscripts"/> package 
     41      included in the <xref linkend="intro-important-bootscripts"/> package
    4242      (as <systemitem class="username">root</systemitem>):</para>
    4343
    … …  
    4848<screen role='root'><userinput>make install-service-dhclient</userinput></screen>
    4949
    50     <para id="dhclient-config1">Next, create the 
     50    <para id="dhclient-config1">Next, create the
    5151    <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhclient</filename>
    52     configuration file with the following commands as the <systemitem 
    53     class="username">root</systemitem> user.  Adjust as 
     52    configuration file with the following commands as the <systemitem
     53    class="username">root</systemitem> user.  Adjust as
    5454    necessary for additional interfaces:</para>
    5555
    … …  
    6666EOF</userinput></screen>
    6767
    68     <para>For more information on the appropriate 
     68    <para>For more information on the appropriate
    6969    <envar>DHCP_START</envar> and <envar>DHCP_STOP</envar>
    7070    values, examine the man page for <command>dhclient</command>.</para>
    7171
    72     <para id="dhclient-config2">Finally, you should create the 
    73     <filename>/etc/dhclient.conf</filename> file using the following commands 
     72    <para id="dhclient-config2">Finally, you should create the
     73    <filename>/etc/dhclient.conf</filename> file using the following commands
    7474    as the <systemitem class="username">root</systemitem> user:</para>
    7575
    … …  
    7979
    8080    <note>
    81       <para>You'll need to add a second interface definition to the file if you 
     81      <para>You'll need to add a second interface definition to the file if you
    8282      have more than one interface.</para>
    8383    </note>

  • connect/dhcp/dhcp.xml

    r5e9a7236 r893d9711  
    1111  <title>DHCP Clients</title>
    1212
    13   <para>DHCP stands for Dynamic Host Configuration Protocol. It is a protocol 
    14   used by many sites to automatically provide information such as IP addresses, 
    15   subnet masks and routing information to computers.  If your network uses 
    16   DHCP, you will need a DHCP client in order to connect to it. 
     13  <para>DHCP stands for Dynamic Host Configuration Protocol. It is a protocol
     14  used by many sites to automatically provide information such as IP addresses,
     15  subnet masks and routing information to computers.  If your network uses
     16  DHCP, you will need a DHCP client in order to connect to it.
    1717  DHCP is also used by some cable modems.</para>
    1818
    19   <para>BLFS currently provides installation instructions for 
    20   two DHCP clients, <command>dhclient</command> (from the 
    21   <application>dhcp</application> package) and <command>dhcpcd</command>. 
    22   BLFS presents both sets of installation instructions and 
    23   discusses how to create an appropriate service script to work with the 
    24   <command>network</command> bootscript and the DHCP 
     19  <para>BLFS currently provides installation instructions for
     20  two DHCP clients, <command>dhclient</command> (from the
     21  <application>dhcp</application> package) and <command>dhcpcd</command>.
     22  BLFS presents both sets of installation instructions and
     23  discusses how to create an appropriate service script to work with the
     24  <command>network</command> bootscript and the DHCP
    2525  client of your choice.</para>
    2626

  • connect/dhcp/dhcpcd.xml

    r5e9a7236 r893d9711  
    3131
    3232    <para>The <application>dhcpcd</application> package contains the
    33     <command>dhcpcd</command> client. This is useful for connecting your computer 
     33    <command>dhcpcd</command> client. This is useful for connecting your computer
    3434    to a network which uses DHCP to assign network addresses.</para>
    3535
    … …  
    5959    <itemizedlist spacing='compact'>
    6060      <listitem>
    61         <para>Required Patch: 
     61        <para>Required Patch:
    6262        <ulink url="&patch-root;/dhcpcd-&dhcpcd-version;-fhs-1.patch"/></para>
    6363      </listitem>
    … …  
    6969    <title>Installation of Dhcpcd</title>
    7070
    71     <para>Install <application>dhcpcd</application> by running the following 
     71    <para>Install <application>dhcpcd</application> by running the following
    7272    commands:</para>
    7373
    … …  
    8686    <title>Command Explanations</title>
    8787
    88     <para><command>patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch</command>: 
    89     <application>dhcpcd</application> unpatched puts all configuration 
    90     and temporary files in <filename class='directory'>/etc/dhcpc</filename>. This 
    91     becomes very annoying when <application>dhcpcd</application> tells you it's 
    92     running and it's not. You look in 
    93     <filename class="directory">/var/run</filename> for the 
    94     <filename>PID</filename> file, but it's not there, the 
     88    <para><command>patch -Np1 -i ../dhcpcd-&dhcpcd-version;-fhs-1.patch</command>:
     89    <application>dhcpcd</application> unpatched puts all configuration
     90    and temporary files in <filename class='directory'>/etc/dhcpc</filename>. This
     91    becomes very annoying when <application>dhcpcd</application> tells you it's
     92    running and it's not. You look in
     93    <filename class="directory">/var/run</filename> for the
     94    <filename>PID</filename> file, but it's not there, the
    9595    <filename>PID</filename> file that needs deleting is in
    96     <filename class="directory">/etc/dhcpc</filename>. This patch brings this 
    97     program into FHS compliance, but more importantly, puts 
     96    <filename class="directory">/etc/dhcpc</filename>. This patch brings this
     97    program into FHS compliance, but more importantly, puts
    9898    files where you expect them to be.</para>
    9999
    100100    <para><parameter>--prefix=""</parameter>: There may be a good reason for
    101101    abandoning the normal BLFS convention of using
    102     <parameter>--prefix=/usr</parameter> here.  If you are installing 
    103     DHCP, it is likely that it is 
    104     required during the boot process and 
    105     <filename class="directory">/usr</filename> may be network mounted, in which 
    106     case <command>dhcpcd</command> wouldn't be available due to being on the 
    107     network! Therefore, depending on your situation, you may want it to be 
    108     installed in <filename class="directory">/sbin</filename> or 
    109     <filename class="directory">/usr/sbin</filename>. This command installs to 
     102    <parameter>--prefix=/usr</parameter> here.  If you are installing
     103    DHCP, it is likely that it is
     104    required during the boot process and
     105    <filename class="directory">/usr</filename> may be network mounted, in which
     106    case <command>dhcpcd</command> wouldn't be available due to being on the
     107    network! Therefore, depending on your situation, you may want it to be
     108    installed in <filename class="directory">/sbin</filename> or
     109    <filename class="directory">/usr/sbin</filename>. This command installs to
    110110    <filename class="directory">/sbin</filename>.</para>
    111111
    … …  
    114114    directory.</para>
    115115
    116     <para><parameter>--mandir=/usr/share/man</parameter>: This command installs 
     116    <para><parameter>--mandir=/usr/share/man</parameter>: This command installs
    117117    the man pages to the <filename class="directory">/usr/share/man</filename>
    118118    directory.</para>
    … …  
    140140      the network service script,
    141141      <filename>/etc/sysconfig/network-devices/services/dhcpcd</filename>
    142       included in the <xref linkend="intro-important-bootscripts"/> package 
     142      included in the <xref linkend="intro-important-bootscripts"/> package
    143143      (as user <systemitem class="username">root</systemitem>):</para>
    144144
    … …  
    149149<screen role='root'><userinput>make install-service-dhcpcd</userinput></screen>
    150150
    151       <para id="dhcpcd-config2">Finally, as the <systemitem 
     151      <para id="dhcpcd-config2">Finally, as the <systemitem
    152152      class="username">root</systemitem> user create the
    153153      <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename>
    154       configuration file using the following commands.  Adjust appropriately 
     154      configuration file using the following commands.  Adjust appropriately
    155155      for additional interfaces:</para>
    156156
    … …  
    166166DHCP_STOP="-k <replaceable>[insert additional stop options here]</replaceable>"
    167167
    168 # Set PRINTIP="yes" to have the script print 
     168# Set PRINTIP="yes" to have the script print
    169169# the DHCP assigned IP address
    170170PRINTIP="no"
    171171
    172 # Set PRINTALL="yes" to print the DHCP assigned values for 
     172# Set PRINTALL="yes" to print the DHCP assigned values for
    173173# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
    174174PRINTALL="no"</literal>
    175175EOF</userinput></screen>
    176176
    177       <para>For more information on the appropriate <envar>DHCP_START</envar> and 
    178       <envar>DHCP_STOP</envar> values, examine the man page for 
     177      <para>For more information on the appropriate <envar>DHCP_START</envar> and
     178      <envar>DHCP_STOP</envar> values, examine the man page for
    179179      <command>dhcpcd</command>.</para>
    180180
    181181      <note>
    182         <para id="dhcpcd-config3">The default behavior of 
    183         <command>dhcpcd</command> is to overwrite (after making backup copies) 
    184         <filename>/etc/resolv.conf</filename>, <filename>/etc/yp.conf</filename> and 
    185         <filename>/etc/ntp.conf</filename> with new files containing information from 
    186         the DHCP server. If this is undesirable, review the 
    187         <command>dhcpcd</command> man page for switches to add to the 
     182        <para id="dhcpcd-config3">The default behavior of
     183        <command>dhcpcd</command> is to overwrite (after making backup copies)
     184        <filename>/etc/resolv.conf</filename>, <filename>/etc/yp.conf</filename> and
     185        <filename>/etc/ntp.conf</filename> with new files containing information from
     186        the DHCP server. If this is undesirable, review the
     187        <command>dhcpcd</command> man page for switches to add to the
    188188        <envar>DHCP_START</envar> value.</para>
    189189      </note>
    … …  
    228228        <term><command>dhcpcd</command></term>
    229229        <listitem>
    230           <para>is an implementation of the DHCP client 
    231           specified in RFC2131 and RFC1541 
     230          <para>is an implementation of the DHCP client
     231          specified in RFC2131 and RFC1541
    232232          (depending on which options are specified).</para>
    233233          <indexterm zone="dhcpcd dhcpcd-prog">

  • connect/dialup/ppp.xml

    r5e9a7236 r893d9711  
    3030    <title>Introduction to PPP</title>
    3131
    32     <para>The <application>PPP</application> package contains the 
     32    <para>The <application>PPP</application> package contains the
    3333    <command>pppd</command> daemon and the <command>chat</command>
    3434    program. This is used for connecting to other machines; often for connecting to
    … …  
    6868
    6969    <note id="ppp-kernel">
    70       <para><application>PPP</application> support must be 
     70      <para><application>PPP</application> support must be
    7171      compiled into the kernel or available as a kernel module.</para>
    7272    </note>
    … …  
    7676    </indexterm>
    7777
    78     <para>Install <application>PPP</application> by running the 
     78    <para>Install <application>PPP</application> by running the
    7979    following commands:</para>
    8080
    … …  
    9494    <title>Command Explanations</title>
    9595
    96     <para><command>make install-etcppp</command>: This command puts example 
     96    <para><command>make install-etcppp</command>: This command puts example
    9797    configuration files in <filename class="directory">/etc/ppp</filename>.</para>
    9898
    … …  
    116116      <title>Configuration Information</title>
    117117
    118       <para>The <application>PPP</application> daemon requires very little 
    119       configuration. The main trick is scripting the connection. This can be done 
    120       either using the <command>chat</command> program which comes with 
     118      <para>The <application>PPP</application> daemon requires very little
     119      configuration. The main trick is scripting the connection. This can be done
     120      either using the <command>chat</command> program which comes with
    121121      this package or by using <xref linkend="wvdial"/>.</para>
    122122
    … …  
    135135      <seglistitem>
    136136        <seg>chat, pppd, pppdump, pppoe-discovery and pppstats</seg>
    137         <seg>Several plugin modules installed in 
     137        <seg>Several plugin modules installed in
    138138        <filename class='directory'>/usr/lib/pppd/2.4.3</filename></seg>
    139139        <seg>/etc/ppp, /usr/include/pppd and /usr/lib/pppd</seg>
    … …  
    149149        <term><command>chat</command></term>
    150150        <listitem>
    151           <para>defines a conversational exchange between the computer and the 
    152           modem. Its primary purpose is to establish the connection between the 
    153           Point-to-Point Protocol Daemon (PPPD) and the remote's 
     151          <para>defines a conversational exchange between the computer and the
     152          modem. Its primary purpose is to establish the connection between the
     153          Point-to-Point Protocol Daemon (PPPD) and the remote's
    154154          <command>pppd</command> process.</para>
    155155          <indexterm zone="ppp chat">
    … …  
    172172        <term><command>pppdump</command></term>
    173173        <listitem>
    174           <para>is used to convert 
    175           <application>PPP</application> record files to a readable 
     174          <para>is used to convert
     175          <application>PPP</application> record files to a readable
    176176          format.</para>
    177177          <indexterm zone="ppp pppdump">
    … …  
    184184        <term><command>pppstats</command></term>
    185185        <listitem>
    186           <para>is used to print 
     186          <para>is used to print
    187187          <application>PPP</application> statistics.</para>
    188188          <indexterm zone="ppp pppstats">

  • connect/dialup/wvdial.xml

    r5e9a7236 r893d9711  
    3030    <title>Introduction to WvDial</title>
    3131
    32     <para>The <application>WvDial</application> package contains a no-nonsense, 
     32    <para>The <application>WvDial</application> package contains a no-nonsense,
    3333    quick and easy to use alternative to <command>chat</command> and
    34     <command>pppd</command> scripts. If you simply want to dial a modem 
    35     without the fuss and hassle of <command>chat</command> issues, then you'll 
     34    <command>pppd</command> scripts. If you simply want to dial a modem
     35    without the fuss and hassle of <command>chat</command> issues, then you'll
    3636    want this.</para>
    3737
    … …  
    6868    <title>Installation of WvDial</title>
    6969
    70     <para>Install <application>WvDial</application> by running the following 
     70    <para>Install <application>WvDial</application> by running the following
    7171    commands:</para>
    7272
    … …  
    8585      <title>Config Files</title>
    8686
    87       <para><filename>/etc/wvdial.conf</filename> and 
     87      <para><filename>/etc/wvdial.conf</filename> and
    8888      <filename>/etc/ppp/peers/*</filename></para>
    8989
    … …  
    101101      <title>Configuration Information</title>
    102102
    103       <para>Perform the following two commands as the 
     103      <para>Perform the following two commands as the
    104104      <systemitem class="username">root</systemitem> user:</para>
    105105
    … …  
    107107wvdialconf /etc/wvdial.conf</userinput></screen>
    108108
    109       <para><command>wvdialconf</command> will test that you have a working modem 
     109      <para><command>wvdialconf</command> will test that you have a working modem
    110110      and try to determine its exact setup. You will then need to enter your
    111111      ISP's phone number, login name and password into the
    … …  
    116116<screen><userinput>wvdial</userinput></screen>
    117117
    118       <para>For more information, examine the <command>wvdialconf</command>, 
    119       <filename>wvdial.conf</filename> and <command>wvdial</command> man 
    120       pages. Also, have a look at <ulink 
     118      <para>For more information, examine the <command>wvdialconf</command>,
     119      <filename>wvdial.conf</filename> and <command>wvdial</command> man
     120      pages. Also, have a look at <ulink
    121121      url="http://www.electronicschat.org/nonroot-dialout/index.html">the
    122122      Non-Root Dial Out HOWTO</ulink> if you want to give non-root users
    … …  
    160160        <term><command>wvdialconf</command></term>
    161161        <listitem>
    162           <para>automates the configuration of 
     162          <para>automates the configuration of
    163163          <command>wvdial</command>.</para>
    164164          <indexterm zone="wvdial wvdialconf">

  • connect/other/other.xml

    r5e9a7236 r893d9711  
    1313  <para>Other methods to connect to large networks are through ISDN
    1414  and PPPoE interfaces, among others. PPPoE is discussed here.
    15   Pages written for ISDN (or others as the need arises) are always welcome 
     15  Pages written for ISDN (or others as the need arises) are always welcome
    1616  and will be included in future books, if available.</para>
    1717

  • connect/other/pppoe.xml

    r5e9a7236 r893d9711  
    3131
    3232    <para>The Roaring Penguin <application>PPPoE</application>
    33     package contains both a client and a server component that works with the 
    34     client. The client allows you to connect to large networks that use the 
    35     PPPoE protocol, common among ADSL providers. The server component 
    36     runs alongside the client, allowing you to configure other clients that send 
     33    package contains both a client and a server component that works with the
     34    client. The client allows you to connect to large networks that use the
     35    PPPoE protocol, common among ADSL providers. The server component
     36    runs alongside the client, allowing you to configure other clients that send
    3737    out a configuration request.</para>
    3838
    … …  
    6565    <xref linkend="net-tools"/> (you may omit
    6666    <application>Net-tools</application> by using the following patch to
    67     utilize <application>IPRoute2</application>: <ulink 
     67    utilize <application>IPRoute2</application>: <ulink
    6868    url="&patch-root;/rp-pppoe-&pppoe-version;-iproute2-1.patch"/>)</para>
    6969
    … …  
    7474
    7575    <note id="pppoe-kernel">
    76       <para>If you plan on using kernel-mode PPPoE, this package is no longer explicitly 
    77       needed, however, it is recomended for ease of configuration. Additional information 
    78       about kernel mode PPPoE can be found in 
     76      <para>If you plan on using kernel-mode PPPoE, this package is no longer explicitly
     77      needed, however, it is recomended for ease of configuration. Additional information
     78      about kernel mode PPPoE can be found in
    7979      <filename>rp-pppoe-&pppoe-version;/doc/KERNEL-MODE-PPPOE</filename>.</para>
    8080    </note>
    … …  
    8888<screen><userinput>sed -i s%/usr/bin/logger%/bin/logger% scripts/adsl-{connect,setup,stop}.in</userinput></screen>
    8989
    90     <para>Install <application>RP-PPPoE</application> by running the following 
     90    <para>Install <application>RP-PPPoE</application> by running the following
    9191    commands:</para>
    9292
    … …  
    107107
    108108    <para>These are the standard installation commands that will install into
    109     the <filename class="directory">/usr</filename> prefix.  You can optionally use the 
     109    the <filename class="directory">/usr</filename> prefix.  You can optionally use the
    110110    <command>go</command> script in the root of the source tree, to
    111     run the same commands, which are then immediately followed by the 
     111    run the same commands, which are then immediately followed by the
    112112    <command>adsl-setup</command> script.</para>
    113113
    … …  
    120120      <title>Config Files</title>
    121121
    122       <para><filename>/etc/ppp/pppoe.conf</filename>, 
    123       <filename>/etc/ppp/firewall-standalone</filename>, 
    124       <filename>/etc/ppp/firewall-masq</filename>, 
    125       <filename>/etc/ppp/pppoe-server-options</filename>, 
    126       <filename>/etc/resolv.conf</filename>, 
    127       <filename>/etc/ppp/pap-secrets</filename>, 
     122      <para><filename>/etc/ppp/pppoe.conf</filename>,
     123      <filename>/etc/ppp/firewall-standalone</filename>,
     124      <filename>/etc/ppp/firewall-masq</filename>,
     125      <filename>/etc/ppp/pppoe-server-options</filename>,
     126      <filename>/etc/resolv.conf</filename>,
     127      <filename>/etc/ppp/pap-secrets</filename>,
    128128      <filename>/etc/ppp/chap-secrets</filename></para>
    129129
    … …  
    161161      <title>Configuration Information</title>
    162162
    163       <para>To configure <application>RP-PPPoE</application> after installation, 
     163      <para>To configure <application>RP-PPPoE</application> after installation,
    164164      you should run the <command>adsl-setup</command> script.</para>
    165165
    166       <para>When configuring your connection, you will need to have your 
    167       ISP's nameserver information available, as well as your 
    168       username and password.  You will also be asked whether to configure a 
    169       dial-on-demand or a constant connection.  If your service provider does not 
    170       charge by the minute, it is usually good to have a bootscript handle the 
    171       connection for you.  You can, of course, choose not to install the 
    172       following script, and start your connection manually with the 
     166      <para>When configuring your connection, you will need to have your
     167      ISP's nameserver information available, as well as your
     168      username and password.  You will also be asked whether to configure a
     169      dial-on-demand or a constant connection.  If your service provider does not
     170      charge by the minute, it is usually good to have a bootscript handle the
     171      connection for you.  You can, of course, choose not to install the
     172      following script, and start your connection manually with the
    173173      <command>adsl-start</command> script.</para>
    174174
    175       <para id="pppoe-init"><emphasis>Optionally</emphasis> install the 
    176       <filename>/etc/sysconfig/network-devices/services/pppoe</filename> service 
     175      <para id="pppoe-init"><emphasis>Optionally</emphasis> install the
     176      <filename>/etc/sysconfig/network-devices/services/pppoe</filename> service
    177177      script included with the <xref linkend="intro-important-bootscripts"/>
    178178      package (as user <systemitem class="username">root</systemitem>).</para>
    … …  
    184184<screen role='root'><userinput>make install-service-pppoe</userinput></screen>
    185185
    186       <para id="pppoe-config2">Now create the config file for use with the 
    187       <filename>pppoe</filename> service script (as user <systemitem 
     186      <para id="pppoe-config2">Now create the config file for use with the
     187      <filename>pppoe</filename> service script (as user <systemitem
    188188      class="username">root</systemitem>):</para>
    189189
    … …  
    194194      <note>
    195195        <para>If you have previously configured the network interface that
    196         will now use PPPoE, you should remove the interface 
    197         configuration files for that interface (as user <systemitem 
     196        will now use PPPoE, you should remove the interface
     197        configuration files for that interface (as user <systemitem
    198198        class="username">root</systemitem>):</para>
    199199
    … …  
    223223
    224224      <seglistitem>
    225         <seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe, 
     225        <seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe,
    226226        pppoe-relay, pppoe-server and pppoe-sniff</seg>
    227227        <seg>None</seg>
    … …  
    238238        <term><command>adsl-connect</command></term>
    239239        <listitem>
    240           <para>is a shell script which manages an ADSL 
     240          <para>is a shell script which manages an ADSL
    241241          connection using the user-space PPPoE client.</para>
    242242          <indexterm zone="pppoe adsl-connect">
    … …  
    249249        <term><command>adsl-setup</command></term>
    250250        <listitem>
    251           <para>is a script for configuring the client. Configuration is 
     251          <para>is a script for configuring the client. Configuration is
    252252          then stored in <filename>/etc/ppp/pppoe.conf</filename>.</para>
    253253          <indexterm zone="pppoe adsl-setup">
    … …  
    260260        <term><command>adsl-start</command></term>
    261261        <listitem>
    262           <para>starts the client using the options specified in 
     262          <para>starts the client using the options specified in
    263263          <filename>/etc/ppp/pppoe.conf</filename>.</para>
    264264          <indexterm zone="pppoe adsl-start">
    … …  
    271271        <term><command>adsl-status</command></term>
    272272        <listitem>
    273           <para>displays the status of the ADSL 
     273          <para>displays the status of the ADSL
    274274          connection.</para>
    275275          <indexterm zone="pppoe adsl-status">
    … …  
    292292        <term><command>pppoe</command></term>
    293293        <listitem>
    294           <para>is the client program. Generally it should not be started on 
     294          <para>is the client program. Generally it should not be started on
    295295          its own.</para>
    296296          <indexterm zone="pppoe pppoe-prog">
    … …  
    323323        <term><command>pppoe-sniff</command></term>
    324324        <listitem>
    325           <para>is a small network sniffer designed to assist in setting 
     325          <para>is a small network sniffer designed to assist in setting
    326326          <envar>PPPOE_EXTRA</envar> settings.</para>
    327327          <indexterm zone="pppoe pppoe-sniff">
Note: See TracChangeset for help on using the changeset viewer.