Merge branch 'maint'

diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 827711c3c9b8ad8c7ecb074c5ec1a9b887992526..4c8d1e638632bc67dcd74536dd6dd287b2604111 100644 (file)
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -59,7 +59,7 @@ OPTIONS
        Useful for patch series and the like.
 
 -u::
-       Update affected files from cvs repository before attempting export.
+       Update affected files from CVS repository before attempting export.
 
 -v::
        Verbose.
@@ -76,7 +76,7 @@ $ git-cvsexportcommit -v <commit-sha1>
 $ cvs commit -F .mgs <files>
 ------------
 
-Merge pending patches into CVS automatically -- only if you really know what you are doing ::
+Merge pending patches into CVS automatically -- only if you really know what you are doing::
 +
 ------------
 $ export GIT_DIR=~/project/.git