From 4a69ad35ee8a3f36ed49434be7fb4c30a4b99da1 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 13 Jan 2011 19:24:15 -0800
Subject: [PATCH] Resolve conflicts -- take 2

---
 docs/three-interface.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/three-interface.xml b/docs/three-interface.xml
index 9b07a6630..ca50d1595 100644
--- a/docs/three-interface.xml
+++ b/docs/three-interface.xml
@@ -181,7 +181,7 @@
         class="directory">/etc/shorewall</filename> directory is empty. This
         is intentional. The released configuration file skeletons may be found
         on your system in the directory <filename
-        class="directory">/usr/share/doc/shorewall-common/default-config</filename>.
+        class="directory">/usr/share/doc/shorewall/default-config</filename>.
         Simply copy the files you need from that directory to <filename
         class="directory">/etc/shorewall</filename> and modify the
         copies.</para>
@@ -199,7 +199,7 @@
         directory. If you don't know where the Shorewall documentation
         directory is, you can find the samples using this command:</para>
 
-        <programlisting>~# rpm -ql shorewall-common | fgrep three-interfaces
+        <programlisting>~# rpm -ql shorewall | fgrep three-interfaces
 /usr/share/doc/packages/shorewall/Samples/three-interfaces
 /usr/share/doc/packages/shorewall/Samples/three-interfaces/interfaces
 /usr/share/doc/packages/shorewall/Samples/three-interfaces/masq
@@ -224,7 +224,7 @@
       <listitem>
         <para><graphic fileref="images/openlogo-nd-25.png" />If you installed
         using a Shorewall 4.x .deb, the samples are in <filename
-        class="directory">/usr/share/doc/shorewall-common/examples/three-interfaces</filename>.
+        class="directory">/usr/share/doc/shorewall/examples/three-interfaces</filename>.
         You do not need the shorewall-doc package to have access to the
         samples.</para>
       </listitem>