Merge branch 'rh/merge-options-doc-fix'

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index f059ea94daf72dc66c9e04455b4fdbb235875c52..d1bcda28f423566dff17a7bff85f40ae07d4ca9a 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