compat/poll: sleep 1 millisecond to avoid busy wait

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index f059ea94daf72dc66c9e04455b4fdbb235875c52..2df9953968ce19e7baf460a9c33de8f56398f11d 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -24,7 +24,7 @@ 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
+Imports a CVS repository into Git. It will either create a new
 repository, or incrementally import into an existing one.
 
 Splitting the CVS log into patch sets is done by 'cvsps'.
@@ -65,18 +65,18 @@ OPTIONS
        `CVS/Repository`.
 
 -C <target-dir>::
-        The git repository to import to.  If the directory doesn't
+       The Git repository to import to.  If the directory doesn't
         exist, it will be created.  Default is the current directory.
 
 -r <remote>::
-       The git remote to import this CVS repository into.
+       The Git remote to import this CVS repository into.
        Moves all CVS branches into remotes/<remote>/<branch>
        akin to the way 'git clone' uses 'origin' by default.
 
 -o <branch-for-HEAD>::
        When no remote is specified (via -r) the 'HEAD' branch
-       from CVS is imported to the 'origin' branch within the git
-       repository, as 'HEAD' already has a special meaning for git.
+       from CVS is imported to the 'origin' branch within the Git
+       repository, as 'HEAD' already has a special meaning for Git.
        When a remote is specified the 'HEAD' branch is named
        remotes/<remote>/master mirroring 'git clone' behaviour.
        Use this option if you want to import into a different
@@ -144,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>
@@ -154,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`