From 7f72d66b906cff796dad61ce73176659c2c8c258 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 8 Sep 2010 11:55:16 -0700
Subject: [PATCH] A couple of documentation updates

---
 docs/CompiledPrograms.xml         |  2 +-
 manpages/shorewall-interfaces.xml | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml
index f3fdf9d04..f66701087 100644
--- a/docs/CompiledPrograms.xml
+++ b/docs/CompiledPrograms.xml
@@ -18,7 +18,7 @@
     <pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
 
     <copyright>
-      <year>2006-2007</year>
+      <year>2006-2010</year>
 
       <holder>Thomas M. Eastep</holder>
     </copyright>
diff --git a/manpages/shorewall-interfaces.xml b/manpages/shorewall-interfaces.xml
index e010989de..cba931940 100644
--- a/manpages/shorewall-interfaces.xml
+++ b/manpages/shorewall-interfaces.xml
@@ -448,17 +448,6 @@ loc     eth2            -</programlisting>
 
                 <para>May not be specified with <emphasis
                 role="bold">required</emphasis>.</para>
-
-                <caution>
-                  <para>Use <option>optional</option> at your own risk. If you
-                  [re]start Shorewall when an 'optional' interface is not
-                  available and then do a <command>shorewall save</command>,
-                  subsequent <command>shorewall restore</command> and
-                  <command>shorewall -f start</command> operations will
-                  instantiate a ruleset that does not support that interface,
-                  even if it is available at the time of the
-                  restore/start.</para>
-                </caution>
               </listitem>
             </varlistentry>
 
@@ -722,8 +711,9 @@ net     ppp0      -</programlisting>
     shorewall-masq(5), shorewall-nat(5), shorewall-netmap(5),
     shorewall-params(5), shorewall-policy(5), shorewall-providers(5),
     shorewall-proxyarp(5), shorewall-route_rules(5),
-    shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5), shorewall-secmarks(5),
-    shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
-    shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
+    shorewall-routestopped(5), shorewall-rules(5), shorewall.conf(5),
+    shorewall-secmarks(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
+    shorewall-tcrules(5), shorewall-tos(5), shorewall-tunnels(5),
+    shorewall-zones(5)</para>
   </refsect1>
 </refentry>