diff --git a/docs/standalone.xml b/docs/standalone.xml
index 5db840a9b..2367b0462 100644
--- a/docs/standalone.xml
+++ b/docs/standalone.xml
@@ -177,23 +177,24 @@
       </listitem>
 
       <listitem>
-        <para>If you installed using a Shorewall 4.x .deb, the samples are in
-        <filename
-        class="directory">/usr/share/doc/shorewall/examples/one-interface</filename>..
+        <para><graphic align="left" fileref="images/openlogo-nd-25.png" />If
+        you installed using a Shorewall 4.x .deb, the samples are in <emphasis
+        role="bold"><filename
+        class="directory">/usr/share/doc/shorewall/examples/one-interface</filename>..</emphasis>
         You do not need the shorewall-doc package to have access to the
         samples.</para>
       </listitem>
     </orderedlist>
 
-    <graphic align="left" fileref="images/openlogo-nd-25.png" />
-
     <warning>
       <para><emphasis role="bold">Note to Debian Users</emphasis></para>
 
-      <para>If you install using the .deb, you will find that your <filename
+      <para>You will find that your <filename
       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
+      intentional. If you need configuration files other than those found in
+      <emphasis role="bold"><filename
+      class="directory">/usr/share/doc/shorewall/examples/one-interface</filename>,
+      </emphasis> they may be found on your system in the directory <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
diff --git a/docs/three-interface.xml b/docs/three-interface.xml
index ca50d1595..eddac848f 100644
--- a/docs/three-interface.xml
+++ b/docs/three-interface.xml
@@ -173,19 +173,7 @@
 
     <para>The configuration files for Shorewall are contained in the directory
     <filename>/etc/shorewall</filename> -- for simple setups, you will only
-    need to deal with a few of these as described in this guide.<graphic
-    align="left" fileref="images/openlogo-nd-25.png" /><warning>
-        <para><emphasis role="bold">Note to Debian Users</emphasis></para>
-
-        <para>If you install using the .deb, you will find that your <filename
-        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/default-config</filename>.
-        Simply copy the files you need from that directory to <filename
-        class="directory">/etc/shorewall</filename> and modify the
-        copies.</para>
-      </warning></para>
+    need to deal with a few of these as described in this guide.</para>
 
     <para><inlinegraphic fileref="images/BD21298_.gif" format="GIF" /></para>
 
@@ -222,11 +210,25 @@
       </listitem>
 
       <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/examples/three-interfaces</filename>.
+        <para><graphic align="left" fileref="images/openlogo-nd-25.png" />If
+        you installed using a Shorewall 4.x .deb, the samples are in <emphasis
+        role="bold"><filename
+        class="directory">/usr/share/doc/shorewall/examples/three-interfaces</filename></emphasis>.
         You do not need the shorewall-doc package to have access to the
         samples.</para>
+
+        <warning>
+          <para><emphasis role="bold">Note to Debian Users</emphasis></para>
+
+          <para>If you install using the .deb, you will find that your
+          <filename 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/default-config</filename>.
+          Simply copy the files you need from that directory to <filename
+          class="directory">/etc/shorewall</filename> and modify the
+          copies.</para>
+        </warning>
       </listitem>
     </orderedlist>
 
diff --git a/docs/two-interface.xml b/docs/two-interface.xml
index 205f9d3a6..7b3520195 100644
--- a/docs/two-interface.xml
+++ b/docs/two-interface.xml
@@ -151,20 +151,7 @@
     <para>The configuration files for Shorewall are contained in the directory
     <filename class="directory">/etc/shorewall</filename> -- for simple
     setups, you will only need to deal with a few of these as described in
-    this guide.<graphic align="left"
-    fileref="images/openlogo-nd-25.png" /><warning>
-        <para><emphasis role="bold">Note to Debian and Ubuntu
-        Users</emphasis></para>
-
-        <para>If you install using the .deb, you will find that your <filename
-        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/default-config</filename>.
-        Simply copy the files you need from that directory to <filename
-        class="directory">/etc/shorewall</filename> and modify the
-        copies.</para>
-      </warning></para>
+    this guide.</para>
 
     <para><inlinegraphic fileref="images/BD21298_.gif"
     format="GIF" /><important>
@@ -202,11 +189,27 @@
           </listitem>
 
           <listitem>
-            <para>If you installed using a Shorewall 4.x .deb, the samples are
-            in <filename
-            class="directory">/usr/share/doc/shorewall-common/examples/two-interfaces</filename>..
+            <para><graphic align="left"
+            fileref="images/openlogo-nd-25.png" />If you installed using a
+            Shorewall 4.x .deb, the samples are in <emphasis
+            role="bold"><filename
+            class="directory">/usr/share/doc/shorewall-common/examples/two-interfaces</filename>.</emphasis>
             You do not need the shorewall-doc package to have access to the
             samples.</para>
+
+            <warning>
+              <para><emphasis role="bold">Note to Debian and Ubuntu
+              Users</emphasis></para>
+
+              <para>If you install using the .deb, you will find that your
+              <filename 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/default-config</filename>.
+              Simply copy the files you need from that directory to <filename
+              class="directory">/etc/shorewall</filename> and modify the
+              copies.</para>
+            </warning>
           </listitem>
         </orderedlist>
       </important></para>