From 7dd4c286fa367ec50028144932e37b23dd26c8e4 Mon Sep 17 00:00:00 2001
From: Murray Stokely <murray@FreeBSD.org>
Date: Sun, 22 Aug 2004 19:11:51 +0000
Subject: [PATCH] Remove a table of terms/definitions following a
 <programlisting> in favor of callouts to the definitions, which looks much
 clearer in print and HTML output.

---
 .../handbook/advanced-networking/chapter.sgml | 62 ++++++++-----------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index c91c708308..5ed10cfe65 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -2992,45 +2992,33 @@ options IPFIREWALL_VERBOSE</programlisting>
 
       <para>The following must be in <filename>/etc/rc.conf</filename>:</para>
 
-      <programlisting>gateway_enable="YES"
-firewall_enable="YES"
-firewall_type="OPEN"
+      <programlisting>gateway_enable="YES" <co id="co-natd-gateway-enable">
+firewall_enable="YES" <co id="co-natd-firewall-enable">
+firewall_type="OPEN" <co id="co-natd-firewall-type">
 natd_enable="YES"
-natd_interface="<replaceable>fxp0</replaceable>"
-natd_flags=""</programlisting>
+natd_interface="<replaceable>fxp0</replaceable>" <co id="co-natd-natd-interface">
+natd_flags="" <co id="co-natd-natd-flags"></programlisting>
 
-      <informaltable frame="none">
-        <tgroup cols="2">
-          <tbody>
-            <row>
-              <entry>gateway_enable="YES"</entry>
-              <entry>Sets up the machine to act as a gateway.  Running
-                <command>sysctl net.inet.ip.forwarding=1</command>
-                would have the same effect.</entry>
-            </row>
-            <row><entry>firewall_enable="YES"</entry>
-             <entry>Enables the firewall rules in
-               <filename>/etc/rc.firewall</filename> at boot.</entry>
-            </row>
-            <row><entry>firewall_type="OPEN"</entry>
-              <entry>This specifies a predefined firewall ruleset that
-                allows anything in.  See
-                <filename>/etc/rc.firewall</filename> for additional
-                types.</entry>
-            </row>
-            <row>
-              <entry>natd_interface="fxp0"</entry>
-              <entry>Indicates which interface to forward packets through
-                (the interface connected to the Internet).</entry>
-            </row>
-            <row>
-              <entry>natd_flags=""</entry>
-              <entry>Any additional configuration options passed to
-                &man.natd.8; on boot.</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
+      <calloutlist>
+        <callout arearefs="co-natd-gateway-enable">
+          <para>Sets up the machine to act as a gateway.  Running
+            <command>sysctl net.inet.ip.forwarding=1</command> would
+            have the same effect.</para>
+        <callout arearefs="co-natd-firewall-enable">
+          <para>Enables the firewall rules in
+            <filename>/etc/rc.firewall</filename> at boot.</para>
+        <callout arearefs="co-natd-firewall-type">
+          <para>This specifies a predefined firewall ruleset that
+            allows anything in.  See
+            <filename>/etc/rc.firewall</filename> for additional
+            types.</para>
+        <callout arearefs="co-natd-natd-interface">
+          <para>Indicates which interface to forward packets through
+            (the interface connected to the Internet).</para>
+        <callout arearefs="co-natd-natd-flags">
+          <para>Any additional configuration options passed to
+            &man.natd.8; on boot.</para>
+      </calloutlist>
 
       <para>Having the previous options defined in
         <filename>/etc/rc.conf</filename> would run