From a88e2afa69fb8c0193d0e2e08a5d6e914c9a345b Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 31 Jul 2010 18:43:54 -0700
Subject: [PATCH] Tweak the Universal documentation

---
 Shorewall/Perl/Shorewall/Zones.pm |  2 +-
 docs/GettingStarted.xml           |  6 +++++-
 docs/Universal.xml                | 24 +++++++++++++++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index bbe06e044..dcfa920e3 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -961,7 +961,7 @@ sub process_interface( $$ ) {
 		fatal_error "The '$option' option requires a value" unless defined $value;
 
 		if ( $option eq 'physical' ) {
-		    fatal_error "Invalid Physical interface name ($value)" unless $value =~ /^[\w.@%-]*\+?$/;
+		    fatal_error "Invalid Physical interface name ($value)" unless $value && $value =~ /^[\w.@%-]*\+?$/;
 
 		    fatal_error "Duplicate physical interface name ($value)" if ( $physical{$value} && ! $port );
 
diff --git a/docs/GettingStarted.xml b/docs/GettingStarted.xml
index c23616943..2bf51d6ac 100644
--- a/docs/GettingStarted.xml
+++ b/docs/GettingStarted.xml
@@ -47,6 +47,8 @@
     </listitem>
   </itemizedlist>
 
+  <para>Now, <ulink url="Install.htm">install Shorewall</ulink>.</para>
+
   <para>Next, read the QuickStart Guide that is appropriate for your
   configuration:</para>
 
@@ -66,7 +68,9 @@
   <itemizedlist>
     <listitem>
       <para><ulink url="standalone.htm">Standalone</ulink> Linux System with a
-      single network interface</para>
+      single network interface (if you are running Shorewall 4.4.12 Beta 3 or
+      later, use the <ulink url="Universal.html">Universal</ulink>
+      configuration instead).</para>
     </listitem>
 
     <listitem>
diff --git a/docs/Universal.xml b/docs/Universal.xml
index 80af53c41..71f90a7f8 100644
--- a/docs/Universal.xml
+++ b/docs/Universal.xml
@@ -35,18 +35,28 @@
   </articleinfo>
 
   <section>
-    <title>What it does</title>
+    <title>Configuring Shorewall</title>
 
-    <para>This document describes a way to install Shorewall on a GNU/Linux
-    system and protect that system. The resulting firewall will:</para>
+    <para>Once you have installed the Shorewall software, you must configure
+    it. The easiest way to do that is to use one of Shorewall's
+    <firstterm>Sample Configurations</firstterm>. The Universal Configuration
+    is one of those samples.</para>
+  </section>
+
+  <section>
+    <title>What the Universal Configuration does</title>
+
+    <para>The Universal Shorewall configuration requires that you simply copy
+    the configuration to <filename class="directory">/etc/shorewall</filename>
+    and start Shorewall. This sample configuation:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Allow all outgoing traffic.</para>
+        <para>Allows all outgoing traffic.</para>
       </listitem>
 
       <listitem>
-        <para>Block all incoming connections except:</para>
+        <para>Blocks all incoming connections except:</para>
 
         <itemizedlist>
           <listitem>
@@ -60,7 +70,7 @@
       </listitem>
 
       <listitem>
-        <para>Allow forwarding of traffic, provided that the system has more
+        <para>Allows forwarding of traffic, provided that the system has more
         than one interface or is set up to route between networks on a single
         interface.</para>
       </listitem>
@@ -70,7 +80,7 @@
   <section>
     <title>How to Install it</title>
 
-    <para>The location of the configuration files is dependent on your
+    <para>The location of the sample configuration files is dependent on your
     distribution and <ulink url="Install.htm">how you installed
     Shorewall</ulink>.</para>