From 28682a24287ea066b20baeab1dc44870ff560d2c Mon Sep 17 00:00:00 2001
From: "Roberto C. Sanchez" <roberto@connexer.com>
Date: Thu, 13 Jan 2011 20:02:19 -0500
Subject: [PATCH] eliminate obsolete references to shorewall-common

---
 docs/standalone.xml    | 25 ++++++++++---------------
 docs/standalone_fr.xml |  4 ++--
 docs/standalone_ru.xml |  6 +++---
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/docs/standalone.xml b/docs/standalone.xml
index 274443559..7c4e062af 100644
--- a/docs/standalone.xml
+++ b/docs/standalone.xml
@@ -161,12 +161,14 @@
         Shorewall documentation directory is, you can find the samples using
         this command:</para>
 
-        <programlisting>~# rpm -ql shorewall-common | fgrep one-interface
-/usr/share/doc/packages/shorewall/Samples/one-interface
-/usr/share/doc/packages/shorewall/Samples/one-interface/interfaces
-/usr/share/doc/packages/shorewall/Samples/one-interface/policy
-/usr/share/doc/packages/shorewall/Samples/one-interface/rules
-/usr/share/doc/packages/shorewall/Samples/one-interface/zones
+        <programlisting>~# rpm -ql shorewall | fgrep one-interface
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface/README.txt
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface/interfaces
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface/policy
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface/rules
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface/shorewall.conf
+/opt/local/doc/shorewall-4.4.16/Samples/one-interface/zones
 ~#</programlisting>
       </listitem>
 
@@ -176,17 +178,10 @@
         in the tarball.</para>
       </listitem>
 
-      <listitem>
-        <para>If you installed using a Shorewall 3.x .deb, the samples are in
-        <filename
-        class="directory">/usr/share/doc/shorewall/examples/one-interface</filename>.
-        You must install the shorewall-doc package.</para>
-      </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/one-interface</filename>..
+        class="directory">/usr/share/doc/shorewall/examples/one-interface</filename>..
         You do not need the shorewall-doc package to have access to the
         samples.</para>
       </listitem>
@@ -201,7 +196,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>
diff --git a/docs/standalone_fr.xml b/docs/standalone_fr.xml
index ece9abf78..c84bfe2d4 100644
--- a/docs/standalone_fr.xml
+++ b/docs/standalone_fr.xml
@@ -249,7 +249,7 @@
         <listitem>
           <para>Si vous avez installé en utilisant un .deb de Shorewall 4.x,
           les exemples sont dans <filename
-          class="directory">/usr/share/doc/shorewall-common/examples/one-interface</filename>.
+          class="directory">/usr/share/doc/shorewall/examples/one-interface</filename>.
           Vous n'avez pas besoin d'installer le paquetage shorewall-doc pour
           pouvoir accéder aux exemples.</para>
         </listitem>
@@ -727,4 +727,4 @@ SSH/ACCEPT  net       $FW           </programlisting>
     possibilités de Shorewall qui peuvent rendre plus aisée l'administration
     de votre firewall Shorewall.</para>
   </section>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/standalone_ru.xml b/docs/standalone_ru.xml
index ca87ed255..43eb0ab0b 100644
--- a/docs/standalone_ru.xml
+++ b/docs/standalone_ru.xml
@@ -169,15 +169,15 @@
         директория <filename class="directory">/etc/shorewall</filename>
         пуста. Это сделано специально. Поставляемые шаблоны файлов
         конфигурации Вы найдете на вашей системе в директории <filename
-        class="directory">/usr/share/doc/shorewall-common/default-config</filename>.
+        class="directory">/usr/share/doc/shorewall/default-config</filename>.
         Просто скопируйте нужные Вам файлы из этой директории в <filename
         class="directory">/etc/shorewall</filename> и отредактируйте
         копии.</para>
 
         <para>Заметьте, что Вы должны скопировать <filename
-        class="directory">/usr/share/doc/shorewall-common/default-config/shorewall.conf</filename>
+        class="directory">/usr/share/doc/shorewall/default-config/shorewall.conf</filename>
         и <filename
-        class="directory">/usr/share/doc/shorewall-common/default-config/modules</filename>
+        class="directory">/usr/share/doc/shorewall/default-config/modules</filename>
         в <filename class="directory">/etc/shorewall</filename> даже если Вы
         не будете изменять эти файлы.</para>
       </warning><inlinegraphic fileref="images/BD21298_.gif"