* Mention the samples in /usr/share/examples/ppp as well as /etc/ppp

* RFC 1597 -> RFC 1918, the former is now obsolete
* Clarify that people can use the 192.168.* addresses on their own networks
  if they want.

1 files changed, 48 insertions, 15 deletions

diff --git a/en_US.ISO8859-1/books/ppp-primer/book.sgml b/en_US.ISO8859-1/books/ppp-primer/book.sgml
index 102c33bafc..38f7f14e7f 100644
--- a/en_US.ISO8859-1/books/ppp-primer/book.sgml
+++ b/en_US.ISO8859-1/books/ppp-primer/book.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE BOOK PUBLIC "-//Davenport//DTD DocBook V3.0//EN">
+<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V3.1-Based Extension//EN">
 <book>
 
 <bookinfo>
@@ -14,7 +14,7 @@
 </author>
 </authorgroup>
 
-<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/ppp-primer/book.sgml,v 1.2 1999/09/17 23:43:40 nik Exp $</pubdate>
+<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/ppp-primer/book.sgml,v 1.3 2000/04/30 22:18:21 nik Exp $</pubdate>
 
 <abstract><para>This is a step-by-step guide for configuring FreeBSD systems to act as
 a dial-up router/gateway in a Local Area Environment.  All entries may
@@ -128,18 +128,50 @@ cabling:
 
 </itemizedlist>
  </para>
-  
-<para>The IP Addresses on the Ethernet side of this sample LAN have been</para>
-  
-<para>taken from the pool of "reserved" addresses proposed in RFC-1597. 
-IP addresses are assigned as follows:
-<literallayout>Name		IP Address
-"Curly"		192.168.1.1	# The FreeBSD box
-"Larry"		192.168.1.2	# The Win'95 box
-"Moe"		192.168.1.3	# The WfW box
-"Shemp"		192.168.1.4	# The Windows NT box</literallayout>
-</para>
-  
+
+<para>The IP addresses on the Ethernet side of this sample LAN have been
+taken from a pool addresses proposed reserved by RFC 1918 for use on
+private LANs, so you are free to use these actual IP addresses on your
+own LAN if you want.  IP addresses are assigned as follows:</para>
+
+<informaltable>
+  <tgroup cols=3>
+    <thead>
+      <row>
+        <entry>Name</entry>
+	<entry>IP Address</entry>
+	<entry>Comment</entry>
+      </row>
+    </thead>
+
+    <tbody>
+      <row>
+        <entry><hostid>Curly</hostid></entry>
+        <entry><hostid role="ipaddr">192.168.1.1</hostid></entry>
+        <entry>The FreeBSD box</entry>
+      </row>
+
+      <row>
+        <entry><hostid>Larry</hostid></entry>
+        <entry><hostid role="ipaddr">192.168.1.2</hostid></entry>
+        <entry>The Win'95 box</entry>
+      </row>
+
+      <row>
+        <entry><hostid>Moe</hostid></entry>
+        <entry><hostid role="ipaddr">192.168.1.3</hostid></entry>
+        <entry>The WfW box</entry>
+      </row>
+
+      <row>
+        <entry><hostid>Shemp</hostid></entry>
+        <entry><hostid role="ipaddr">192.168.1.4</hostid></entry>
+        <entry>The Windows NT box</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</informaltable>
+
 <para>This guide assumes that the modem on the FreeBSD box is connected 
 to the first serial port ('<filename>/dev/cuaa0</filename>' or '<emphasis remap=tt>COM1:</emphasis>' in
 DOS-terms).</para>
@@ -699,7 +731,8 @@ in the '<filename>/etc</filename>' directory.</para>
 <title>Create your own PPP configuration files</title>
 
 <para>By default, the FreeBSD installation process creates a number of
-sample configuration files in the /etc/ppp directory.  Please take
+sample configuration files in the <filename>/etc/ppp</filename>
+and <filename>/usr/share/examples/ppp</filename> directories.  Please take
 some time to review these files; they were derived from working
 systems and represent the features and capabilities of the PPP
 program.</para>