Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint

* jk/cvsimport-does-not-work-with-cvsps3:
git-cvsimport.txt: cvsps-2 is deprecated

diff --combined Documentation/git-cvsimport.txt
index 9d5353e8be4a56cb92c1987e40a3695b23733d56,fd1e613d957a5e041e16bae55f9f1cc247cbb250..f059ea94daf72dc66c9e04455b4fdbb235875c52
--- 1/Documentation/git-cvsimport.txt
--- 2/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@@ -18,6 -18,12 +18,12 @@@ SYNOPSI
  
  DESCRIPTION
  -----------
+ *WARNING:* `git cvsimport` uses cvsps version 2, which is considered
+ deprecated; it does not work with cvsps version 3 and later.  If you are
+ performing a one-shot import of a CVS repository consider using
+ link:http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
+ link:https://github.com/BartMassey/parsecvs[parsecvs].
+ 
  Imports a CVS repository into git. It will either create a new
  repository, or incrementally import into an existing one.
  
@@@ -213,9 -219,11 +219,9 @@@ Problems related to tags
  * Multiple tags on the same revision are not imported.
  
  If you suspect that any of these issues may apply to the repository you
 -want to import consider using these alternative tools which proved to be
 -more stable in practice:
 +want to imort, consider using cvs2git:
  
 -* cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org`
 -* parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs`
 +* cvs2git (part of cvs2svn), `http://subversion.apache.org/`
  
  GIT
  ---