X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fcvs-migration.txt;h=826d0897e2fd2ad2f63677b477c9e1e0f62337ae;hb=3026402cbc60c003c4bc043368afc619e4d9b3cd;hp=2bd58d3fd8aefb68d1d49c099805178b02c4218c;hpb=b8bc67cef31453233f1ff6722c0bd3c99df44756;p=git.git

diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index 2bd58d3f..826d0897 100644
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -1,7 +1,7 @@
 git for CVS users
 =================
 
-So you're a CVS user. That's ok, it's a treatable condition.  The job of
+So you're a CVS user. That's OK, it's a treatable condition.  The job of
 this document is to put you on the road to recovery, by helping you
 convert an existing cvs repository to git, and by showing you how to use a
 git repository in a cvs-like fashion.
@@ -140,7 +140,7 @@ You can update the shared repository with your changes using:
 $ git push origin master
 ------------------------------------------------
 
-If some else has updated the repository more recently, `git push`, like
+If someone else has updated the repository more recently, `git push`, like
 `cvs commit`, will complain, in which case you must pull any changes
 before attempting the push again.
 
@@ -159,7 +159,7 @@ other than `master`.
 
 [NOTE]
 ============
-Because of this behaviour, if the shared repository and the developer's
+Because of this behavior, if the shared repository and the developer's
 repository both have branches named `origin`, then a push like the above
 attempts to update the `origin` branch in the shared repository from the
 developer's `origin` branch.  The results may be unexpected, so it's