# HG changeset patch
# User diego
# Date 1120347220 0
# Node ID 688fa06538efecb35890ebc8baad7c348c1b6d66
# Parent  ca32c9d618654c5b13be938eb6c6f40fab502c69
Mandrake --> Mandriva name change
patch by Christian Korff < christian - dot - korff - at - gmail - dot - com >

diff -r ca32c9d61865 -r 688fa06538ef DOCS/xml/en/codecs.xml
--- a/DOCS/xml/en/codecs.xml	Sat Jul 02 22:19:52 2005 +0000
+++ b/DOCS/xml/en/codecs.xml	Sat Jul 02 23:33:40 2005 +0000
@@ -862,7 +862,7 @@
 </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 -r ca32c9d61865 -r 688fa06538ef DOCS/xml/en/ports.xml
--- a/DOCS/xml/en/ports.xml	Sat Jul 02 22:19:52 2005 +0000
+++ b/DOCS/xml/en/ports.xml	Sat Jul 02 23:33:40 2005 +0000
@@ -58,7 +58,7 @@
 </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 -r ca32c9d61865 -r 688fa06538ef DOCS/xml/en/users-vs-dev.xml
--- a/DOCS/xml/en/users-vs-dev.xml	Sat Jul 02 22:19:52 2005 +0000
+++ b/DOCS/xml/en/users-vs-dev.xml	Sat Jul 02 23:33:40 2005 +0000
@@ -17,9 +17,9 @@
 <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 -r ca32c9d61865 -r 688fa06538ef DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml	Sat Jul 02 22:19:52 2005 +0000
+++ b/DOCS/xml/en/video.xml	Sat Jul 02 23:33:40 2005 +0000
@@ -1321,7 +1321,7 @@
   <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>