4 files changed, 24 insertions, 69 deletions
diff --git a/DOCS/xml/en/bugreports.xml b/DOCS/xml/en/bugreports.xml
index 7d8a297173..56163dc671 100644
--- a/DOCS/xml/en/bugreports.xml
+++ b/DOCS/xml/en/bugreports.xml
@@ -37,7 +37,7 @@ mailing list will assist you if you have questions.
 </para>
 </sect1>
 <sect1 id="bugreports_regression_test">
-<title>How to do regression testing using CVS</title>
+<title>How to do regression testing using Subversion</title>
 <para>
 A problem that can happen sometimes is 'it used to work before, now it
 doesn't anymore...'.
@@ -45,17 +45,17 @@ Here is a step by step procedure to try to pinpoint when the problem
 occurred. This is <emphasis role="bold">not</emphasis> for casual users.
 </para>
 <para>
-First, you'd need to fetch MPlayer's source tree from CVS.
+First, you'd need to fetch MPlayer's source tree from Subversion.
 Instructions can be found at the bottom of
 <ulink url="http://www.mplayerhq.hu/dload.html">this page</ulink>.
 </para>
 <para>
-You will have now in the main/ directory an image of the CVS tree, on the
+You will have now in the mplayer/ directory an image of the Subversion tree, on the
 client side.
 Now update this image to the date you want:
 <screen>
-cd main/
-cvs update -PAd -D "2004-08-23"
+cd mplayer/
+svn update -r {"2004-08-23"}
 </screen>
 The date format is YYYY-MM-DD HH:MM:SS.
 Using this date format ensure that you will be able to extract patches
@@ -72,7 +72,7 @@ make
 <para>
 If any non-programmer reads this, the fastest method to get at the point
 where the problem occurred is to use a binary search &mdash; that is,
-search the date of the breackage by repeatedly dividing the search
+search the date of the breakage by repeatedly dividing the search
 interval in half.
 For example, if the problem occurred in 2003, start at mid-year, then ask
 "Is the problem already here?".
@@ -91,10 +91,10 @@ back to the present.)
 </para>
 <para>
 When you have found the day where the problem happened, continue the search
-using the mplayer-cvslog archive (sorted by date) and a more precise cvs
+using the mplayer-cvslog archive (sorted by date) and a more precise svn
 update including hour, minute and second:
 <screen>
-cvs update -PAd -D "2004-08-23 15:17:25"
+svn update -r {"2004-08-23 15:17:25"}
 </screen>
 This will allow you to easily find the exact patch that did it.
 </para>
@@ -113,11 +113,11 @@ the bug is :-).
 <sect1 id="bugreports_report">
 <title>How to report bugs</title>
 <para>
-First of all please try the latest CVS version of <application>MPlayer</application>
+First of all please try the latest Subversion version of <application>MPlayer</application>
 as your bug might already be fixed there. Development moves extremely fast,
 most problems in official releases are reported within days or even hours, so
-please use <emphasis role="bold">only CVS</emphasis> to report bugs. This
-includes binary packages of <application>MPlayer</application>. CVS
+please use <emphasis role="bold">only Subversion</emphasis> to report bugs. This
+includes binary packages of <application>MPlayer</application>. Subversion
 instructions can be found at the bottom of
 <ulink url="http://www.mplayerhq.hu/dload.html">this page</ulink> or in
 the README. If this did not help please refer to the list of
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 11f6426f57..4f90349b18 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -221,56 +221,11 @@ and <ulink url="http://ffmpeg.org/ffmpeg-doc.html#SEC20">audio</ulink> codecs.
 </para>
 
 <para>
-If you use an <application>MPlayer</application> release you have
-<systemitem class="library">libavcodec</systemitem>
-right in the package, just build  as usual. If you use
-<application>MPlayer</application> from CVS you have to extract
-<systemitem class="library">libavcodec</systemitem> from
-the FFmpeg CVS tree as FFmpeg releases are very rare. The CVS is mostly stable
-and offers the most features. In order to achieve this do:
-</para>
-
-<procedure>
-<step><para>
-  <screen>cvs -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg login</screen>
-  </para></step>
-<step><para>
-  <screen>cvs -z3 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -P ffmpeg/libavcodec ffmpeg/libavutil</screen>
-  </para></step>
-<step><para>
-  Move the <filename>libavcodec</filename> and <filename>libavutil</filename>
-  directories from the FFmpeg
-  sources to the root of the <application>MPlayer</application> CVS tree.
-  It should look like this:
-  <filename class="directory">main/libavcodec</filename>
-  <filename class="directory">main/libavutil</filename>
-  </para><para>
-  Symlinking is <emphasis role="bold">not</emphasis> enough, you have to
-  copy/move it!
-  </para></step>
-<step><para>
-  If you prefer having <systemitem class="library">libavcodec</systemitem>
-  updated at the same time you update
-  <application>MPlayer</application> CVS, put the following line into the
-  <filename>main/CVS/Entries</filename> file:
-  <screen>D/libavcodec////</screen>
-  <screen>D/libavutil////</screen>
-  </para></step>
-<step><para>
-  Compile. <filename>configure</filename> should detect problems before
-  compilation.
-  </para></step>
-</procedure>
-
-<note>
-<para>
-<application>MPlayer</application> from CVS does contain a
-<filename>libavcodec</filename> subdirectory, but it does
-<emphasis role="bold">not</emphasis> contain the source for
-<systemitem class="library">libavcodec</systemitem>!
-You must follow the steps above to obtain the source for this library.
-</para>
-</note>
+Both <application>MPlayer</application> releases and
+<application>MPlayer</application> from Subversion contain
+<systemitem class="library">libavcodec</systemitem> so you don't have
+to care about making a separate <systemitem class="library">libavcodec</systemitem> checkout.
+Just run <filename>configure</filename> and compile.
 
 <para>
 With FFmpeg and my Matrox G400, I can view even the highest resolution DivX
@@ -507,7 +462,7 @@ decoders:
 <procedure>
 <title>COMPILING MPLAYER WITH QUICKTIME LIBRARIES SUPPORT</title>
 <note><para>Currently only 32-bit Intel platforms are supported.</para></note>
-<step><para>download <application>MPlayer</application> CVS</para></step>
+<step><para>download <application>MPlayer</application> Subversion</para></step>
 <step><para>download QuickTime DLL pack from
 <ulink url="http://www.mplayerhq.hu/MPlayer/releases/codecs/"/>
 </para></step>
@@ -610,14 +565,14 @@ decoders:
   however major changes and improvements have been implemented since
   that time, both in terms of more functionalities supported and in
   terms of improved CPU usage.
-  Just to be certain, it is always a good idea to use a recent CVS
+  Just to be certain, it is always a good idea to use a recent Subversion
   checkout.
 </para>
 <para>
   If you want a quick and easy way to know whether there have been
   recent changes to <systemitem class="library">libavcodec</systemitem>'s
   H.264 decoding, you might keep an eye on 
-  <ulink url="http://mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/h264.c?cvsroot=FFMpeg">FFmpeg CVS repository's web interface</ulink>.
+  <ulink url="http://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec/h264.c?view=log">FFmpeg Subversion repository's web interface</ulink>.
 </para>
 </sect3>
 
@@ -631,8 +586,8 @@ decoders:
   --></screen>
   <application>MPlayer</application> sources are updated whenever
   an <systemitem class="library">x264</systemitem> API change
-  occurs, so it is always suggested to use CVS
-  <application>MPlayer</application> as well.
+  occurs, so it is always suggested to use
+  <application>MPlayer</application> from Subversion as well.
   Perhaps this situation will change when and if an
   <systemitem class="library">x264</systemitem> "release" occurs.
   Meanwhile, <systemitem class="library">x264</systemitem> should
diff --git a/DOCS/xml/en/mail-lists.xml b/DOCS/xml/en/mail-lists.xml
index 9d6735d128..0d744c4a1b 100644
--- a/DOCS/xml/en/mail-lists.xml
+++ b/DOCS/xml/en/mail-lists.xml
@@ -81,14 +81,14 @@ fix or you have noticed a possible bug/problem in the commit).
 </para>
 <para>This list is about <application>MPlayer</application> documentation
 and homepage discussions.
-Documentation and homepage related CVS logs are also sent here.
+Documentation and homepage related SVN logs are also sent here.
 </para></listitem>
 <listitem><para>
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-translations"><application>MPlayer</application>-translations</ulink>
 </para>
 <para>This list is about <application>MPlayer</application> documentation
 and homepage translation discussions.
-Documentation and homepage translation CVS logs are also sent here.
+Documentation and homepage translation Subversion logs are also sent here.
 </para></listitem>
 <listitem><para>
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-cygwin"><application>MPlayer</application>-cygwin</ulink>
diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml
index bf79ce1db3..0882c674a0 100644
--- a/DOCS/xml/en/skin.xml
+++ b/DOCS/xml/en/skin.xml
@@ -1047,7 +1047,7 @@ Loads an audio file (with the fileselector)
 <varlistentry>
   <term><emphasis role="bold">evNone</emphasis></term>
   <listitem><para>
-Empty message, it has no effect (except maybe in CVS versions :-)).
+Empty message, it has no effect (except maybe in Subversion versions :-)).
     </para></listitem>
 </varlistentry>