From eed786ceefc44a954a0a110537d4693331a27009 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 2 Jul 2005 23:33:40 +0000
Subject: Mandrake --> Mandriva name change patch by Christian Korff <
 christian - dot - korff - at - gmail - dot - com >

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15895 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/en/codecs.xml       | 2 +-
 DOCS/xml/en/ports.xml        | 2 +-
 DOCS/xml/en/users-vs-dev.xml | 6 +++---
 DOCS/xml/en/video.xml        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 498a48e18b..17f0dee41f 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -862,7 +862,7 @@ make install
 </screen>
 Binaries are not available from audiocoding.com, but you can (apt-)get Debian
 packages from <ulink url="http://hpisi.nerim.net">Christian Marillat's homepage</ulink>,
-Mandrake RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink> and RedHat RPMs
+Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink> and RedHat RPMs
 from <ulink url="http://greysector.rangers.eu.org/">Grey Sector</ulink>.
 </para>
 </sect3>
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index 2efd6c3bbb..fe2dff3e0b 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -58,7 +58,7 @@ from his <ulink url="http://rpm.greysector.net/mplayer/">repository</ulink>.
 </para>
 
 <para>
-Mandrake RPM packages are available from the <ulink url="http://plf.zarb.org/">P.L.F.</ulink>.
+Mandrake/Mandriva RPM packages are available from the <ulink url="http://plf.zarb.org/">P.L.F.</ulink>.
 SuSE used to include a crippled version of <application>MPlayer</application>
 in their distribution. They have removed it in their latest releases. You can
 get working RPMs from
diff --git a/DOCS/xml/en/users-vs-dev.xml b/DOCS/xml/en/users-vs-dev.xml
index 20c4e2509d..97bd16df34 100644
--- a/DOCS/xml/en/users-vs-dev.xml
+++ b/DOCS/xml/en/users-vs-dev.xml
@@ -17,9 +17,9 @@ patched CVS version of GCC in their distribution and named it
 <emphasis role="bold">2.96</emphasis>. Red Hat included this version in the
 distribution because GCC 3.0 was not finished at the time, and they needed
 a compiler that worked well on all of their supported platforms, including
-IA64 and s390. The Linux distributor <emphasis role="bold">Mandrake</emphasis> also
-followed Red Hat's example and started shipping GCC 2.96 with their
-Linux-Mandrake 8.0 series.
+IA64 and s390. The Linux distributor <emphasis role="bold">Mandrake</emphasis>
+(now Mandriva) also followed Red Hat's example and started shipping GCC 2.96
+with their Linux-Mandrake 8.0 series.
 </para>
 </formalpara>
 
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index a7ef268860..a0e5f4a80f 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -1321,7 +1321,7 @@ It won't work!
   <application>MPlayer</application> you will have
   <emphasis role="bold">ROM font</emphasis> loaded instead of national.
   You can load national font again by using <command>setsysfont</command>
-  utility from the Mandrake distribution for example.
+  utility from the Mandrake/Mandriva distribution for example.
   (<emphasis role="bold">Hint</emphasis>: The same utility is used for
   localization of fbdev).
   </simpara></listitem>
-- 
cgit v1.2.3