svn commit: r42991 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip

Dru Lavigne dru at FreeBSD.org
Thu Oct 17 21:22:39 UTC 2013


Author: dru
Date: Thu Oct 17 21:22:38 2013
New Revision: 42991
URL: http://svnweb.freebsd.org/changeset/doc/42991

Log:
  Initial header tightening in prep for reviewing this chapter. Many more patches to come.

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	Thu Oct 17 19:42:08 2013	(r42990)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 21:22:38 2013	(r42991)
@@ -6,16 +6,17 @@
 -->
 
 <chapter id="ppp-and-slip">
+  <!--
   <chapterinfo>
     <authorgroup>
       <author>
 	<firstname>Jim</firstname>
 	<surname>Mock</surname>
-	<contrib>Restructured, reorganized, and updated by </contrib>
-	<!-- 1 Mar 2000 -->
+	<contrib>Restructured, reorganized, and updated by in Mar 2000</contrib>
       </author>
     </authorgroup>
   </chapterinfo>
+  -->
 
   <title>PPP</title>
 
@@ -48,15 +49,15 @@
       </listitem>
     </itemizedlist>
 
-    <indexterm id="ppp-ppp-user">
+    <indexterm>
       <primary>PPP</primary>
       <secondary>user PPP</secondary>
     </indexterm>
-    <indexterm id="ppp-ppp-kernel">
+    <indexterm>
       <primary>PPP</primary>
       <secondary>kernel PPP</secondary>
     </indexterm>
-    <indexterm id="ppp-ppp-ethernet">
+    <indexterm>
       <primary>PPP</primary>
       <secondary>over Ethernet</secondary>
     </indexterm>
@@ -75,6 +76,7 @@
   </sect1>
 
   <sect1 id="userppp">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -106,14 +108,9 @@
 	</author>
       </authorgroup>
     </sect1info>
+    -->
 
-    <title>Using User PPP</title>
-
-    <sect2>
-      <title>User PPP</title>
-
-      <sect3>
-	<title>Assumptions</title>
+    <title>Configuring PPP</title>
 
 	<para>This document assumes you have the following:</para>
 
@@ -198,17 +195,6 @@
 	    characters is also important.</para>
 	</note>
 
-      </sect3>
-
-      <sect3>
-	<title>Automatic <application>PPP</application>
-	  Configuration</title>
-
-	<indexterm>
-	  <primary>PPP</primary>
-	  <secondary>configuration</secondary>
-	</indexterm>
-
 	<para><command>ppp</command> uses the configuration files
 	  located in <filename class="directory">/etc/ppp</filename>.
 	  Examples can be found in <filename
@@ -222,8 +208,8 @@
 	  (i.e., your IP address changes each time you connect to
 	  your ISP).</para>
 
-	<sect4 id="userppp-staticIP">
-	  <title>PPP and Static IP Addresses</title>
+	<sect2 id="userppp-staticIP">
+	  <title>PPP With Static IP Addresses</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
@@ -513,10 +499,10 @@ protocol: ppp</screen>
 	    <filename
 	      class="directory">/usr/share/examples/ppp/</filename>
 	    directory.</para>
-	</sect4>
+	</sect2>
 
-	<sect4 id="userppp-dynamicIP">
-	  <title>PPP and Dynamic IP Addresses</title>
+	<sect2 id="userppp-dynamicIP">
+	  <title>PPP With Dynamic IP Addresses</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
@@ -615,9 +601,9 @@ protocol: ppp</screen>
 	    and
 	    <filename>/usr/share/examples/ppp/ppp.linkup.sample</filename>
 	    for a detailed example.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>Receiving Incoming Calls</title>
 
 	  <indexterm>
@@ -636,9 +622,9 @@ protocol: ppp</screen>
 	    file contains the following:</para>
 
 	  <programlisting>gateway_enable="YES"</programlisting>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>Which getty?</title>
 
 	  <para><link linkend="dialup">Configuring FreeBSD for
@@ -665,9 +651,9 @@ protocol: ppp</screen>
 	  <para>Refer to <link linkend="userppp-mgetty">Mgetty and
 	      AutoPPP</link> for more information on
 	    <command>mgetty</command>.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title><application>PPP</application> Permissions</title>
 
 	  <para>The <command>ppp</command> command must normally be
@@ -688,10 +674,10 @@ protocol: ppp</screen>
 	  <para>If this command is used in the
 	    <literal>default</literal> section, it gives the specified
 	    users access to everything.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
-	  <title>PPP Shells for Dynamic-IP Users</title>
+	<sect2>
+	  <title>PPP Shells for Dynamic IP Users</title>
 
 	  <indexterm>
 	    <primary>PPP shells</primary>
@@ -740,10 +726,10 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	    <para>which prevents <filename>/etc/motd</filename> from
 	      being displayed.</para>
-	  </sect4>
+	  </sect2>
 
-	  <sect4>
-	    <title>PPP Shells for Static-IP Users</title>
+	  <sect2>
+	    <title>PPP Shells for Static IP Users</title>
 
 	    <indexterm>
 	      <primary>PPP shells</primary>
@@ -767,11 +753,11 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	      their shell set to the symbolic link created above (for
 	      example, <username>mary</username>'s shell should be
 	      <filename>/etc/ppp/ppp-mary</filename>).</para>
-	  </sect4>
+	  </sect2>
 
-	  <sect4>
+	  <sect2>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Dynamic-IP Users</title>
+	      Dynamic IP Users</title>
 
 	    <para>The <filename>/etc/ppp/ppp.conf</filename> file
 	      should contain something along the lines of:</para>
@@ -798,11 +784,11 @@ ttyu1:
 	      to the one for <literal>ttyu0:</literal> above.  Each
 	      line should get a unique IP address from your pool of
 	      IP addresses for dynamic users.</para>
-	  </sect4>
+	  </sect2>
 
-	  <sect4>
+	  <sect2>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Static-IP Users</title>
+	      Static IP Users</title>
 
 	    <para>Along with the contents of the sample
 	      <filename>/usr/share/examples/ppp/ppp.conf</filename>
@@ -834,9 +820,9 @@ sam:
 
 mary:
   add 203.14.103.0 netmask 255.255.255.0 HISADDR</programlisting>
-	</sect4>
+	</sect2>
 
-	<sect4 id="userppp-mgetty">
+	<sect2 id="userppp-mgetty">
 	  <title><command>mgetty</command> and AutoPPP</title>
 
 	  <indexterm>
@@ -907,9 +893,9 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 	    <filename>/etc/ppp/ppp.secret</filename>.  See
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
 	    for examples.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>MS Extensions</title>
 
 	  <indexterm>
@@ -950,9 +936,9 @@ set nbns 203.14.100.5</programlisting>
 	    <literal>set dns</literal> line is omitted, PPP will
 	    use the values found in
 	    <filename>/etc/resolv.conf</filename>.</para>
-	</sect4>
+	</sect2>
 
-	<sect4 id="userppp-PAPnCHAP">
+	<sect2 id="userppp-PAPnCHAP">
 	  <title>PAP and CHAP Authentication</title>
 
 	  <indexterm><primary>PAP</primary></indexterm>
@@ -1023,9 +1009,9 @@ set nbns 203.14.100.5</programlisting>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>Changing Your <command>ppp</command> Configuration
 	    on the Fly</title>
 
@@ -1046,10 +1032,9 @@ set nbns 203.14.100.5</programlisting>
 	  <para>Once a socket has been set up, the &man.pppctl.8;
 	    program may be used in scripts that wish to manipulate
 	    the running program.</para>
-	</sect4>
-      </sect3>
+	</sect2>
 
-      <sect3 id="userppp-nat">
+      <sect2 id="userppp-nat">
 	<title>Using PPP Network Address Translation
 	  Capability</title>
 
@@ -1080,9 +1065,9 @@ nat port tcp 10.0.0.2:http http</program
 	<para>or do not trust the outside at all</para>
 
 	<programlisting>nat deny_incoming yes</programlisting>
-      </sect3>
+      </sect2>
 
-      <sect3 id="userppp-final">
+      <sect2 id="userppp-final">
 	<title>Final System Configuration</title>
 
 	<indexterm>
@@ -1188,9 +1173,9 @@ ifconfig_tun0=</programlisting>
 	  <filename>start_if.tun0</filename> script), type:</para>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
-      </sect3>
+      </sect2>
 
-      <sect3>
+      <sect2>
 	<title>Summary</title>
 
 	<para>To recap, the following steps are necessary when setting
@@ -1278,21 +1263,21 @@ ifconfig_tun0=</programlisting>
 	      file.</para>
 	  </step>
 	</procedure>
-      </sect3>
     </sect2>
   </sect1>
 
   <sect1 id="ppp-troubleshoot">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Tom</firstname>
 	  <surname>Rhodes</surname>
-	  <contrib>Contributed by </contrib>
+	  <contrib>Contributed by in June 2003</contrib>
 	</author>
       </authorgroup>
-      <!-- 13 June 2003 -->
     </sect1info>
+    -->
     <title>Troubleshooting <acronym>PPP</acronym> Connections</title>
 
     <indexterm>
@@ -1460,8 +1445,9 @@ OK
 	connection to the <acronym>ISP</acronym> and lowercase p's
 	show that the connection has been lost for whatever reason.
 	<command>ppp</command> only has these 2 states.</para>
+      </sect2>
 
-      <sect3>
+      <sect2>
 	<title>Debugging</title>
 
 	<para>If you have a direct line and cannot seem to make a
@@ -1546,15 +1532,11 @@ nameserver <replaceable>y.y.y.y</replace
 
 	<para>to <filename>/etc/syslog.conf</filename>.  In most
 	  cases, this functionality already exists.</para>
-
-      </sect3>
     </sect2>
   </sect1>
 
-
-
-
   <sect1 id="pppoe">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -1562,12 +1544,11 @@ nameserver <replaceable>y.y.y.y</replace
 	  <surname>Mock</surname>
 	  <contrib>Contributed (from
 	    http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html)
-	    by </contrib>
+	    by in Jan 2000</contrib>
 	</author>
       </authorgroup>
-      <!-- 10 Jan 2000 -->
     </sect1info>
-
+    -->
     <title>Using PPP over Ethernet (PPPoE)</title>
 
     <indexterm>
@@ -1575,26 +1556,9 @@ nameserver <replaceable>y.y.y.y</replace
       <secondary>over Ethernet</secondary>
     </indexterm>
 
-    <indexterm>
-      <primary>PPPoE</primary>
-      <see>PPP, over Ethernet</see>
-    </indexterm>
-
     <para>This section describes how to set up PPP over Ethernet
       (<acronym>PPPoE</acronym>).</para>
 
-    <sect2>
-      <title>Configuring the Kernel</title>
-
-      <para>No kernel configuration is necessary for PPPoE any longer.
-	If the necessary netgraph support is not built into the
-	kernel, it will be dynamically loaded by
-	<application>ppp</application>.</para>
-    </sect2>
-
-    <sect2>
-      <title>Setting Up <filename>ppp.conf</filename></title>
-
       <para>Here is an example of a working
 	<filename>ppp.conf</filename>:</para>
 
@@ -1610,18 +1574,10 @@ name_of_service_provider:
   set login
   add default HISADDR</programlisting>
 
-    </sect2>
-
-    <sect2>
-      <title>Running <application>ppp</application></title>
-
       <para>As <username>root</username>, you can run:</para>
 
       <screen>&prompt.root; <userinput>ppp -ddial name_of_service_provider</userinput></screen>
 
-    </sect2>
-
-    <sect2>
       <title>Starting <application>ppp</application> at Boot</title>
 
       <para>Add the following to your
@@ -1631,7 +1587,6 @@ name_of_service_provider:
 ppp_mode="ddial"
 ppp_nat="YES"	# if you want to enable nat for your local network, otherwise NO
 ppp_profile="name_of_service_provider"</programlisting>
-    </sect2>
 
     <sect2>
       <title>Using a PPPoE Service Tag</title>
@@ -1670,16 +1625,10 @@ ppp_profile="name_of_service_provider"</
       <para>Do not forget to change <replaceable>ISP</replaceable>
 	to the profile you have just found above.</para>
 
-      <para>For additional information, see:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><ulink
+      <para>For additional information, refer to <ulink
 	      url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
 	    Broadband with FreeBSD on DSL</ulink> by Renaud
 	    Waldura.</para>
-	</listitem>
-      </itemizedlist>
     </sect2>
 
     <sect2 id="ppp-3com">
@@ -1714,7 +1663,6 @@ ppp_profile="name_of_service_provider"</
 	and a &tm.3com; <trademark
 	  class="registered">HomeConnect</trademark> ADSL Modem at
 	the same time.</para>
-
     </sect2>
   </sect1>
 
@@ -1784,7 +1732,6 @@ ppp_profile="adsl"</programlisting>
       <para>For this to work correctly you will need to have used the
 	sample <filename>ppp.conf</filename> which is supplied with
 	the <filename role="package">net/pppoa</filename> port.</para>
-
     </sect2>
 
     <sect2>
@@ -1897,7 +1844,6 @@ ng0: flags=88d1<UP,POINTOPOINT,RUNNIN
 
     <para>Using <application>mpd</application> is the recommended
       way to connect to an ADSL service with &os;.</para>
-
   </sect2>
 
   <sect2>


More information about the svn-doc-all mailing list