Merge branch 'maint-1.6.1' into maint

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index b7a8c10b8709108c1c8a0d14f661c179c2b4f22c..8f9ba74c8bc95c36e8586e921f4df6617e999d82 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -62,7 +62,7 @@ OPTIONS
 -r <remote>::
        The git remote to import this CVS repository into.
        Moves all CVS branches into remotes/<remote>/<branch>
-       akin to the 'git-clone' "--use-separate-remote" option.
+       akin to the way 'git-clone' uses 'origin' by default.
 
 -o <branch-for-HEAD>::
        When no remote is specified (via -r) the 'HEAD' branch