From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jan 2013 16:25:36 +0000 (-0800)
Subject: Merge branch 'er/stop-recommending-parsecvs'
X-Git-Tag: v1.8.2-rc0~163
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/00f1a867b4dde5065a579286a4de880142548bb2?hp=414c78ccff47f8261b102b1842ff66a475cf7e7b

Merge branch 'er/stop-recommending-parsecvs'

Stop recommending a defunct third-party software.

* er/stop-recommending-parsecvs:
Remove the suggestion to use parsecvs, which is currently broken.
---

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 98d9881d7e..9d5353e8be 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -213,11 +213,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
 ---