# HG changeset patch
# User kraymer
# Date 1161524088 0
# Node ID 8a12502290a72f570bc9103cfb898ddbd2b5ab62
# Parent  7b1516f23d22d8db8c3617689b57095a0aa60222
remove some DivX version numbers

diff -r 7b1516f23d22 -r 8a12502290a7 DOCS/xml/en/codecs.xml
--- a/DOCS/xml/en/codecs.xml	Sun Oct 22 13:19:55 2006 +0000
+++ b/DOCS/xml/en/codecs.xml	Sun Oct 22 13:34:48 2006 +0000
@@ -24,8 +24,8 @@
   <emphasis role="bold">MPEG-2</emphasis> (<emphasis role="bold">DVD</emphasis>) video
   </simpara></listitem>
 <listitem><simpara>
-  native decoders for <emphasis role="bold">DivX ;-), OpenDivX (DivX4),
-  DivX6 (Pro), 3ivX, M$ MPEG-4</emphasis> v1, v2 and other MPEG-4 variants
+  native decoders for <emphasis role="bold">all DivX variants,
+  3ivX, M$ MPEG-4</emphasis> v1, v2 and other MPEG-4 variants
   </simpara></listitem>
 <listitem><simpara>
   native decoder for <emphasis role="bold">Windows Media Video 7/8</emphasis>
@@ -120,7 +120,7 @@
 <para>
 It began as a forked development of the OpenDivX codec.
 This happened when ProjectMayo changed OpenDivX to closed source
-DivX4 (now DivX6), and the non-ProjectMayo people working on OpenDivX got angry,
+DivX4, and the non-ProjectMayo people working on OpenDivX got angry,
 then started XviD. So both projects have the same origin.
 </para>
 
diff -r 7b1516f23d22 -r 8a12502290a7 DOCS/xml/en/encoding-guide.xml
--- a/DOCS/xml/en/encoding-guide.xml	Sun Oct 22 13:19:55 2006 +0000
+++ b/DOCS/xml/en/encoding-guide.xml	Sun Oct 22 13:34:48 2006 +0000
@@ -2382,7 +2382,7 @@
   H.263+
   </entry></row>
 <row><entry>mpeg4</entry><entry>
-  ISO standard MPEG-4 (DivX6, XviD compatible)
+  ISO standard MPEG-4 (DivX, XviD compatible)
   </entry></row>
 <row><entry>msmpeg4</entry><entry>
   pre-standard MPEG-4 variant by MS, v3 (AKA DivX3)