# HG changeset patch
# User diego
# Date 1149860024 0
# Node ID 7548a6a100da2641371bb9a8721ea088808b87b3
# Parent  db8821b163e53c782c561a18e12ebd73c250c67c
CVS --> Subversion

diff -r db8821b163e5 -r 7548a6a100da DOCS/tech/cvs-howto.txt
--- a/DOCS/tech/cvs-howto.txt	Fri Jun 09 13:32:57 2006 +0000
+++ b/DOCS/tech/cvs-howto.txt	Fri Jun 09 13:33:44 2006 +0000
@@ -1,6 +1,6 @@
 
-About CVS write access:
-~~~~~~~~~~~~~~~~~~~~~~~
+About Subversion write access:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Before everything else, you should know how to use CVS properly. CVS comes with
 some documentation, as usual
@@ -181,7 +181,7 @@
    particular bug. Comments such as "fixed!" or "Changed it." are unacceptable.
 
 8. If you apply a patch by someone else, include the name and email address in
-   the CVS log message. Since the mplayer-cvslog mailing list is publicly
+   the log message. Since the mplayer-cvslog mailing list is publicly
    archived you should add some spam protection to the email address. Send an
    answer to mplayer-dev-eng (or wherever you got the patch from) saying that
    you applied the patch. If the patch contains a documentation change, commit
@@ -190,7 +190,7 @@
 9. Do NOT commit to code actively maintained by others without permission. Send
    a patch to mplayer-dev-eng instead.
 
-10. Subscribe to the mplayer-cvslog mailing list. The diffs of all CVS commits
+10. Subscribe to the mplayer-cvslog mailing list. The diffs of all commits
     are sent there and reviewed by all the other developers. Bugs and possible
     improvements or general questions regarding commits are discussed there. We
     expect you to react if problems with your code are uncovered.
@@ -199,14 +199,6 @@
     unsure how best to do this, send a patch to mplayer-docs, the documentation
     maintainers will review and commit your stuff.
 
-12. Revert a commit ONLY in case of a big blunder like committing something not
-    intended to be committed or committing a wrong file, the wrong version of a
-    patch, cosmetics or broken code and you are going to recommit the right
-    thing immediately.
-
-    Never revert changes made a long time ago or buggy code. Fix it in the
-    normal way instead.
-
 Also read DOCS/tech/patches.txt !!!!
 
 We think our rules are not too hard. If you have comments, contact us.