summaryrefslogtreecommitdiff
path: root/Documentation/cvs-migration.txt
diff options
context:
space:
mode:
authorHorst H. von Brand <vonbrand@inf.utfsm.cl>2006-06-03 20:27:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-04 06:54:55 (GMT)
commitabda1ef590d94a5e15e7ce3b685b5c092a790cfa (patch)
tree73162a92b2abd5d87b86566899e321dd8ccef59c /Documentation/cvs-migration.txt
parent895f10c3b596ef955c7f252717e5b4668530c569 (diff)
downloadgit-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.zip
git-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.tar.gz
git-abda1ef590d94a5e15e7ce3b685b5c092a790cfa.tar.bz2
Documentation: Spelling fixes
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/cvs-migration.txt')
-rw-r--r--Documentation/cvs-migration.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index fa94efd..826d089 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.
@@ -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