receive-pack: allow hooks to ignore its standard input stream

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 1786d9dc9636a981ad088151c7f4a5d081931315..260f39fd40db2078635fecf8c7fe27976175d13f 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -18,6 +18,12 @@ SYNOPSIS
 
 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
+http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
+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.
 
@@ -138,7 +144,7 @@ This option can be used several times to provide several detection regexes.
        CVS by default uses the Unix username when writing its
        commit logs. Using this option and an author-conv-file
        maps the name recorded in CVS to author name, e-mail and
-       optional timezone:
+       optional time zone:
 +
 ---------
        exon=Andreas Ericsson <ae@op5.se>
@@ -148,7 +154,7 @@ This option can be used several times to provide several detection regexes.
 +
 'git cvsimport' will make it appear as those authors had
 their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
-all along.  If a timezone is specified, GIT_AUTHOR_DATE will
+all along.  If a time zone is specified, GIT_AUTHOR_DATE will
 have the corresponding offset applied.
 +
 For convenience, this data is saved to `$GIT_DIR/cvs-authors`