From b6a8bf94c43377124795ad1ce29851078c4fb6d4 Mon Sep 17 00:00:00 2001
From: judas_iscariote <judas_iscariote@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 25 Nov 2005 00:07:10 +0000
Subject: [PATCH] "mandrake" doesn't exists anymore...

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3062 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/FAQ.xml     | 4 ++--
 Shorewall-docs2/Install.xml | 4 ++--
 Shorewall-docs2/bridge.xml  | 6 +++---
 Shorewall-docs2/support.xml | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Shorewall-docs2/FAQ.xml b/Shorewall-docs2/FAQ.xml
index ede9dcaf7..219246648 100644
--- a/Shorewall-docs2/FAQ.xml
+++ b/Shorewall-docs2/FAQ.xml
@@ -162,7 +162,7 @@ DNAT    net    loc:&lt;l<emphasis>ocal IP address</emphasis>&gt;[:&lt;<emphasis>
           </listitem>
 
           <listitem>
-            <para>You are running Mandrake Linux prior to 10.0 final and have
+            <para>You are running Mandriva Linux prior to 10.0 final and have
             configured Internet Connection Sharing. In that case, the name of
             your local zone is 'masq' rather than 'loc' (change all instances
             of 'loc' to 'masq' in your rules). You may want to consider
@@ -857,7 +857,7 @@ LOGBURST=""</programlisting>
       </itemizedlist>
 
       <tip>
-        <para>Under RedHat and Mandrake, the max <ulink
+        <para>Under RedHat and Mandriva, the max <ulink
         url="shorewall_logging.html">log level</ulink> that is sent to the
         console is specified in /etc/sysconfig/init in the LOGLEVEL variable.
         Set <quote>LOGLEVEL=5</quote> to suppress info (log level 6) messages
diff --git a/Shorewall-docs2/Install.xml b/Shorewall-docs2/Install.xml
index c308ce83f..e6b07f665 100644
--- a/Shorewall-docs2/Install.xml
+++ b/Shorewall-docs2/Install.xml
@@ -85,7 +85,7 @@
         also an RPM package provided by Simon Matter that is taylored for
         <trademark><emphasis role="bold">RedHat/Fedora</emphasis></trademark>
         and another package from Jack Coates that is customized for <emphasis
-        role="bold"><trademark>Mandrake</trademark></emphasis>. All of these
+        role="bold"><trademark>Mandriva</trademark></emphasis>. All of these
         are available from the <ulink
         url="http://www.shorewall.net/download.htm">download
         page</ulink>.</para>
@@ -300,7 +300,7 @@
         known to work with Suse, Power PPC, Trustix and TurboLinux. There is
         also an RPM package provided by Simon Matter that is taylored for
         RedHat/Fedora and another package from Jack Coates that is customized
-        for Mandrake. If you try to upgrade using the wrong package, it
+        for Mandriva. If you try to upgrade using the wrong package, it
         probably won't work.</para>
       </listitem>
 
diff --git a/Shorewall-docs2/bridge.xml b/Shorewall-docs2/bridge.xml
index 4d273bace..98d44f83e 100755
--- a/Shorewall-docs2/bridge.xml
+++ b/Shorewall-docs2/bridge.xml
@@ -224,7 +224,7 @@ MTU=''</programlisting>
     </blockquote>
 
     <para>Here's an /etc/sysconfig/network-scripts/ifcfg-br0 file for a
-    <trademark>Mandrake</trademark> system:</para>
+    <trademark>Mandriva</trademark> system:</para>
 
     <blockquote>
       <programlisting>DEVICE=br0
@@ -232,7 +232,7 @@ BOOTPROTO=dhcp
 ONBOOT=yes</programlisting>
     </blockquote>
 
-    <para>On both the SUSE and Mandrake systems, a separate script is required
+    <para>On both the SUSE and Mandriva systems, a separate script is required
     to configure the bridge itself.</para>
 
     <para>Here are scripts that I used on a <trademark>Suse</trademark> 9.1
@@ -348,7 +348,7 @@ BRIDGE=br0
 ONBOOT=yes</programlisting></para>
     </blockquote>
 
-    <para>Florin Grad at <trademark>Mandrake</trademark> provides this script
+    <para>Florin Grad at <trademark>Mandriva</trademark> provides this script
     for configuring a bridge:</para>
 
     <blockquote>
diff --git a/Shorewall-docs2/support.xml b/Shorewall-docs2/support.xml
index a68d9b823..27e8286fb 100644
--- a/Shorewall-docs2/support.xml
+++ b/Shorewall-docs2/support.xml
@@ -348,9 +348,9 @@ State:Stopped (Tue Aug 30 14:08:11 PDT 2005)</programlisting>
     role="bold">IMPORTANT</emphasis>: You must subscribe to the list before
     you will be able to post to it (see link below).</para>
 
-    <para><emphasis role="bold">If you run Shorewall under MandrakeSoft Multi
+    <para><emphasis role="bold">If you run Shorewall under MandrivaSoft Multi
     Network Firewall (MNF) and you have not purchased an MNF license from
-    MandrakeSoft then you can post non MNF-specific Shorewall questions to the
+    MandrivaSoft then you can post non MNF-specific Shorewall questions to the
     <ulink url="mailto:shorewall-users@lists.sourceforge.net">Shorewall users
     mailing list</ulink>. Do not expect to get free MNF support on the
     list</emphasis>.</para>