Date: Fri, 18 Oct 2013 19:37:57 +0000 (UTC) From: Dru Lavigne <dru@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43003 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip Message-ID: <201310181937.r9IJbvBI064237@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dru Date: Fri Oct 18 19:37:57 2013 New Revision: 43003 URL: http://svnweb.freebsd.org/changeset/doc/43003 Log: White space fix only. Translators can ignore. Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Fri Oct 18 19:12:33 2013 (r43002) +++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml Fri Oct 18 19:37:57 2013 (r43003) @@ -36,7 +36,7 @@ <itemizedlist> <listitem> - <para>How to configure, use, and troubleshoot a + <para>How to configure, use, and troubleshoot a <acronym>PPP</acronym> connection.</para> </listitem> <listitem> @@ -44,7 +44,8 @@ (<acronym>PPPoE</acronym>).</para> </listitem> <listitem> - <para>How to set up <acronym>PPP</acronym> over <acronym>ATM</acronym> + <para>How to set up <acronym>PPP</acronym> over + <acronym>ATM</acronym> (<acronym>PPPoA</acronym>).</para> </listitem> </itemizedlist> @@ -109,8 +110,8 @@ <para>&os; provides built-in support for managing dial-up <acronym>PPP</acronym> connections using &man.ppp.8;. In order - to use a <acronym>PPP</acronym> connection, the following - items are needed:</para> + to use a <acronym>PPP</acronym> connection, the following items + are needed:</para> <itemizedlist> <listitem> @@ -133,9 +134,10 @@ </listitem> <listitem> - <para>The <acronym>IP</acronym> address of one or more <acronym>DNS</acronym> - servers. Normally, the <acronym>ISP</acronym> provides these - addresses. If it did not, &os; can be configured to use + <para>The <acronym>IP</acronym> address of one or more + <acronym>DNS</acronym> servers. Normally, the + <acronym>ISP</acronym> provides these addresses. If it did + not, &os; can be configured to use <acronym>DNS</acronym> negotiation.</para> </listitem> </itemizedlist> @@ -152,9 +154,8 @@ gateway. If this information is unknown, the <acronym>ISP</acronym> will automatically provide the correct value during connection setup. When - configuring <acronym>PPP</acronym> on &os;, - this address is referred to as - <literal>HISADDR</literal>.</para> + configuring <acronym>PPP</acronym> on &os;, this address is + referred to as <literal>HISADDR</literal>.</para> </listitem> <listitem> @@ -171,29 +172,28 @@ <para>If the <acronym>ISP</acronym> has assigned a static <acronym>IP</acronym> address and hostname, it should be - input into the configuration file. - Otherwise, this information will be automatically provided during + input into the configuration file. Otherwise, this + information will be automatically provided during connection setup.</para> </listitem> </itemizedlist> <para>The rest of this section demonstrates how to configure &os; - for common <acronym>PPP</acronym> connection - scenarios. The required configuration file is + for common <acronym>PPP</acronym> connection scenarios. The + required configuration file is <filename>/etc/ppp/ppp.conf</filename> and additional files and examples are available in <filename class="directory">/usr/share/examples/ppp/</filename>.</para> <note> <para>Throughout this section, many of the file examples - display line numbers. These line - numbers have been added to make it easier to follow the discussion - and are not meant to be placed in the actual file.</para> - - <para>When editing a configuration file, proper - indentation is - important. Lines that end in a <literal>:</literal> start in the - first column (beginning of the line) while all other lines + display line numbers. These line numbers have been added to + make it easier to follow the discussion and are not meant to + be placed in the actual file.</para> + + <para>When editing a configuration file, proper indentation is + important. Lines that end in a <literal>:</literal> start in + the first column (beginning of the line) while all other lines should be indented as shown using spaces or tabs.</para> </note> @@ -206,9 +206,10 @@ addresses</secondary> </indexterm> - <para>If the <acronym>ISP</acronym>, also known as the peer, has provided an address that does not change, - edit <filename>/etc/ppp/ppp.conf</filename> as described in - the example below.</para> + <para>If the <acronym>ISP</acronym>, also known as the peer, has + provided an address that does not change, edit + <filename>/etc/ppp/ppp.conf</filename> as described in the + example below.</para> <programlisting>1 default: 2 set log Phase Chat LCP IPCP CCP tun command @@ -233,9 +234,10 @@ <term>Line 1:</term> <listitem> - <para>Identifies the <literal>default</literal> entry. Commands in this - entry (lines 2 through 9) are executed automatically when <command>ppp</command> is - run.</para> + <para>Identifies the <literal>default</literal> entry. + Commands in this entry (lines 2 through 9) are + executed automatically when <command>ppp</command> + is run.</para> </listitem> </varlistentry> @@ -243,9 +245,10 @@ <term>Line 2:</term> <listitem> - <para>Enables verbose logging parameters for testing the connection. Once the - configuration is working satisfactorily, this line - should be reduced to:</para> + <para>Enables verbose logging parameters for testing + the connection. Once the configuration is working + satisfactorily, this line should be reduced + to:</para> <programlisting>set log phase tun</programlisting> @@ -256,9 +259,9 @@ <term>Line 3:</term> <listitem> - <para>Displays the version of &man.ppp.8; to the - <acronym>PPP</acronym> software running on the other side of the - connection.</para> + <para>Displays the version of &man.ppp.8; to the + <acronym>PPP</acronym> software running on the other + side of the connection.</para> </listitem> </varlistentry> @@ -269,9 +272,7 @@ <para>Identifies the device to which the modem is connected, where <devicename>COM1</devicename> is <filename class="devicefile">/dev/cuau0</filename> - and - <devicename>COM2</devicename> is - <filename + and <devicename>COM2</devicename> is <filename class="devicefile">/dev/cuau1</filename>.</para> </listitem> </varlistentry> @@ -281,8 +282,8 @@ <listitem> <para>Sets the connection speed. If - <literal>115200</literal> does not work on an older modem, - try <literal>38400</literal> instead.</para> + <literal>115200</literal> does not work on an older + modem, try <literal>38400</literal> instead.</para> </listitem> </varlistentry> @@ -291,12 +292,14 @@ <listitem> <para>The dial string written as an expect-send - syntax. Refer to &man.chat.8; for more information.</para> + syntax. Refer to &man.chat.8; for more + information.</para> <para>Note that this command continues onto the next line for readability. Any command in <filename>ppp.conf</filename> may do this if the - last character on the line is <literal>\</literal>.</para> + last character on the line is + <literal>\</literal>.</para> </listitem> </varlistentry> @@ -304,7 +307,8 @@ <term>Line 8:</term> <listitem> - <para>Sets the idle timeout for the link in seconds.</para> + <para>Sets the idle timeout for the link in + seconds.</para> </listitem> </varlistentry> @@ -312,9 +316,12 @@ <term>Line 9:</term> <listitem> - <para>Instructs the peer to confirm the <acronym>DNS</acronym> - settings. If the local network is running its own <acronym>DNS</acronym> server, - this line should be commented out, by adding a <literal>#</literal> at the beginning of the line, or removed.</para> + <para>Instructs the peer to confirm the + <acronym>DNS</acronym> settings. If the local + network is running its own <acronym>DNS</acronym> + server, this line should be commented out, by adding + a <literal>#</literal> at the beginning of the line, + or removed.</para> </listitem> </varlistentry> @@ -344,24 +351,26 @@ <term>Line 12:</term> <listitem> - <para>Use the phone number for the <acronym>ISP</acronym>. - Multiple phone numbers may be specified using the - colon (<literal>:</literal>) or pipe character - (<literal>|</literal>) as a separator. To rotate - through the numbers, use a colon. To - always attempt to dial the first number first and - only use the other numbers if the first number - fails, use the pipe character. Always enclose the - entire set of phone numbers between quotation - marks (<literal>"</literal>) to prevent dialing failures.</para> - </listitem> + <para>Use the phone number for the + <acronym>ISP</acronym>. Multiple phone numbers may + be specified using the colon (<literal>:</literal>) + or pipe character (<literal>|</literal>) as a + separator. To rotate through the numbers, use a + colon. To always attempt to dial the first number + first and only use the other numbers if the first + number fails, use the pipe character. Always + enclose the entire set of phone numbers between + quotation marks (<literal>"</literal>) to prevent + dialing failures.</para> + </listitem> </varlistentry> <varlistentry> <term>Lines 13 & 14:</term> <listitem> - <para>Use the user name and password for the <acronym>ISP</acronym>.</para> + <para>Use the user name and password for the + <acronym>ISP</acronym>.</para> </listitem> </varlistentry> @@ -369,12 +378,11 @@ <term>Line 15:</term> <listitem> - <para>Sets the default idle - timeout - in seconds for the connection. In this example, the - connection will be closed automatically after 300 - seconds of inactivity. To prevent a timeout, - set this value to zero.</para> + <para>Sets the default idle timeout in seconds for the + connection. In this example, the connection will be + closed automatically after 300 seconds of + inactivity. To prevent a timeout, set this value to + zero.</para> </listitem> </varlistentry> @@ -383,12 +391,12 @@ <listitem> <para>Sets the interface addresses. The <replaceable>x.x.x.x</replaceable> should be - replaced by the static <acronym>IP</acronym> address that - the <acronym>ISP</acronym> has allocated and the - <replaceable>y.y.y.y</replaceable> should be + replaced by the static <acronym>IP</acronym> address + that the <acronym>ISP</acronym> has allocated and + the <replaceable>y.y.y.y</replaceable> should be replaced by the <acronym>IP</acronym> address of the - default gateway. If the <acronym>ISP</acronym> has not - provided a gateway address, use <hostid + default gateway. If the <acronym>ISP</acronym> has + not provided a gateway address, use <hostid role="netmask">10.0.0.2/0</hostid>. When using a <quote>guessed</quote> address, create an entry in <filename>/etc/ppp/ppp.linkup</filename> as per the @@ -402,21 +410,22 @@ <term>Line 17:</term> <listitem> - <para>Keep this line as-is as it adds a default route to the gateway. The - <literal>HISADDR</literal> will automatically be replaced - with the gateway address specified on line 16. It - is important that this line appears after line 16.</para> - - <para>When <option>-auto</option> mode is not used to start the connection, this - line should be moved to - <filename>ppp.linkup</filename>. Examples for this + <para>Keep this line as-is as it adds a default route + to the gateway. The <literal>HISADDR</literal> will + automatically be replaced with the gateway address + specified on line 16. It is important that this + line appears after line 16.</para> + + <para>When <option>-auto</option> mode is not used to + start the connection, this line should be moved to + <filename>ppp.linkup</filename>. Examples for this file can be found in <filename class="directory">/usr/share/examples/ppp/</filename>. - However, - <filename>ppp.linkup</filename> is not needed when running &man.ppp.8; in - <option>-auto</option> mode as the routing table entries - are already correct.</para> - </listitem> + However, <filename>ppp.linkup</filename> is not + needed when running &man.ppp.8; in + <option>-auto</option> mode as the routing table + entries are already correct.</para> + </listitem> </varlistentry> </variablelist> </sect2>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310181937.r9IJbvBI064237>